Removed unnecessary controller tests. Added enough tests to get 100%
coverage