Fix unstable-test suite and Google openid test