Add Controller class and test