Test framework refactoring