Fix up tests and enrollment behavior.