CLOUDIFY-2531 finish impl and update existing tests