fix tests and maven test config, remove some debug stuff, one assertion
typo fix
Merge remote-tracking branch 'origin/master'