add and fix more tests [ci skip]