Rename test related resources to be with the bundle name, instead of entity name.
Merge pull request #32 from Gizra/rename-resources

Rename test related resources to be with the bundle name, instead of entity name
Merge master