Finished Controller class. Added some scenario tests