#JC-1381 - fixed unit tests of the refactored classes