CFY-797 fix types in tests