refactors the test datastore a bit