Fix up some ResetToken tests