Finished Datastore JUNIT test with Restructured Datastore component closes #37 closes #39