[JE, MS] {refactoring} Refactor TestCases
Merge branch 'master' of https://github.com/DusanTrkulja/sw14_xp_02