made data storage entity dependent, updated unit tests.
Merge pull request #43 from tutorgen/data-store-fix

made data storage entity dependent, updated unit tests.