#JC-1361 Refactoring of tests