Updating Data Store Classes
Updating the DataStore classes and adding One test function in the test
package.