GH #315 - Adding new resources.
Merge branch 'dsuch-t-gh315-enmasse-all-resources'
Fixed failing tests.