refactored tests around
fix more circular lazy require problems