Begin refactoring tests, updating