CLOUDIFY-2318 fix tests, remove irrelevant tests