Google says self-driving car tests now focused on city driving