fix more tests
more tests fixed
another test fixed
more tests fixed
final tests fixed