simplify
fix more tests