AUT_Fitnesse: Refactoring