Refactor controllers to use 'resolve'
Rename tests to follow controller names
Unit tests for controllers