Begin refactoring tests to reduce duplicate test coverage