Test refactorization