Test refactors.