Refactoring for AUT