CLOUDIFY-2525 fix tests
CLOUDIFY-2525 update for travis (to be reverted)