CLOUDIFY-1848 Fixed tests based on CR comments from elip