CFY-642 fix to testenv