Split out resolvers
Tests and Coverage
Grunt, Travis and Lint Fixes