try to fix more tests - some debugging
Merge remote-tracking branch 'origin/master'