Refactored more of the controller resolver

Summary:
- Added more features testing
- Deleted unnecessary codes