Clean Up Resolve Partials with Tests

I cleaned up the resolve partials a bit based on feedback from [rails_best_practices](https://github.com/railsbp/rails_best_practices) and added some tests for the partials that I touched.
I'll continue to chip away at this for improved maintainability.