Updated tests.
Removed test datastore.
Improved interfaces.
Refactored datastore.