Test refactoring after review