Merge pull request #33 from kshchepanovskyi/fix/improve-tests

Upgrade JUnit to 4.11
Merge branch 'master' into feature/service-code-generation