Fix for inadvertently broken test, plus better way to verify Google auth