made some more tests work
fix more tests