Began refactoring the entire test structure