Replacing datastore.xml import with class import
Merge pull request #125 from rlandy/automate_tests

Replacing datastore.xml import with class import