CLOUDIFY-1526 added tests
CLOUDIFY-1526 fix tests due to interface change