CLOUDIFY-1998 fix the tests to support the new behavior.