small changes in tests
resolved merge-conflict
Merge branch 'master' of https://github.com/axelniklasson/blue-java