Added storage format
Add test data