Fixup user testing for recent changes.