Fixed some JUnit errors
Merge branch 'master' of https://github.com/PawelMaj/Software-Engineering