Added and Fixed some ControllerTests