Updated the features to reflect the incoming resolver refactor
New controller resolver, without hacky closure wrapper
Added more feature tests
Refactored more of the controller resolver

Summary:
- Added more features testing
- Deleted unnecessary codes
Added more features test
Merge branch 'refactor-resolver' into develop