WIP - upping the test coverage

This could technically be merged but I'd like to wait until one of the other controllers gets mocked / tested.

Please leave this here :D