CLOUDIFY-2083 fix broken unit tests