`stop` method was not called on the mock controller, it was called on
the mock object and therefore was a no-op.
Also rewrite a bit to just use addCleanup instead of a tearDown method,
for readability (so that cleanup code appears next to the code which
needs cleanup later).