tests: fix more unit tests