CLOUDIFY-1896 Cleaned old tests