tidy up fixtures and fix test_errors