Bug fixes, test challenges