Data update
Update tests
Merge branch 'public' into pypy
Update to latest data
Merge branch 'public' into pypy
Fix tests