Bug 22521: (RM follow-up) Adjust tests to use new accounttype