Remove junk from test
Change data store path
Add storage reader/writer