Refactored tests to share more code across tests.