CLOUDIFY-1620 Improved test stability and speed (Reviewed by Nirb)