CLOUDIFY-1808 fix tests
CLOUDIFY-1808 rename type to derived_from