Test refactor.