Add EAV format for sample data
Move test datum into test code
Add support for EAV formatted data