cleanup

I also got the tests passing, although a few controller tests were invalid since there's no filtering active during unit tests - you'll need proper functional tests for those