CLOUDIFY-1851 fix broken tests