CLOUDIFY-1842 Fixed the tests.