Update data and tests.
Update data
Update version
Merged with public