CFY-606 fix tests
Merge pull request #90 from cloudify-cosmo/feature/CFY-606-final-fixes

CFY-606 fix tests