Test refactor continues.