Test refactoring update