assertions and comments fixes
fix assertion
fix more assertions
fix test