fixed failing tests
Merge branch 'master' of https://github.com/jutzig/jabylon.git