Unit test speed improvements

This should always be overridden by the testcases if needed.
Not a must: should these cleanup tasks also go in a tearDown method? (Or, be moved entirely to a tearDown method if state is clean enough for the first test?)