CFY-661 fixed unit tests