Added tests and functionality for controller resolver