Take out the trash, simplify.  Stubs for testing the test.