refactoring unit tests

* entity-centric resources instead of unit-test-centric
* removing lots of boilerplate