CFY-847 fixed unit tests