CLOUDIFY-1565 refactor tests