fix #88
fix more tests
remove warning