CFY-1185 fix tests
Merge pull request #136 from cloudify-cosmo/CFY-1185-remove-plugin-inheritance

CFY-1185 fix tests