CLOUDIFY-2222 fixed unit tests.