CFY-759 tests hotfix