FIxing the tests to look better in the controller