Added interface for dataStore
Refactored tests