Fix all the tests

I've also moved to using verifyAll in more of the tests for automatic
mock checks
Remove unrelated event change