Add controller and remove test