fix more regressions
fix more tests