CFY-797 fix types in tests
Merge branch 'develop' into feature/CFY-797-puppet-master-tests
CFY-797 remove skip annotation
Merge pull request #20 from cloudify-cosmo/feature/CFY-797-puppet-master-tests

CFY-797 fix types in tests