fixed assertions
Merge branch 'develop' of github.com:cloudify-cosmo/cloudify-system-tests into develop