Simplify GoogleClient scope definitions
Fix ldap tests
Make ldap emit ready instead of bound