Fixed some failing tests caused by the openID changes