Improve test goto assignments and test workers
Fix bugs highlighted by the new tests