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