Merge branch 'new_junit_tests' into 'master'

New JUnit tests

See merge request !27
4 jobs for master