Improve Data
Add tests for data.