wip: fix more tests