using apply instead of this
making a few other changes
cleaning up ResourceServiceSpecs to work with new ResourceService
tests still fail however