Some password reset test fixes