test for old style checks, fix more unit tests