habres - fix broken tests
habres - fix more broken tests