remove management commands, fix more tests