CFY-647 fixed unit tests