wip
fix more tests and references