Reorganize test data store