Fixup openid test to reflect changes merged from master