Added some JUnit tests
Merge remote-tracking branch 'origin/master' into TestClassesLina