More test refactoring. Added startUp and tearDowns.