Added Junit tests
Merge branch 'master' of https://github.com/vainarouski/Junit