Refactor more tests.  More unit-sized tests.