Moved tearDown methods to new class