MAJ-1094: fixed unit tests