CLOUDIFY-2164 Added missing validations and tests.