Upgrade JUnit to 4.11
Fix and improve tests
Merge branch 'master' of https://github.com/aidGer/aidGer