More openid changes for testing