Refactor unit tests to combine the two approaches.