Added test utility with setup/teardown helper methods and refactored
existing tests to utilize.