Upstream code changes from r622

Test data needs building in order to run tests
Update data and fix unit tests
Merge pull request #13 from giggsey/google_v5.9

Google v5.9