Refactoring Tes