Fix a datastore bug and further implementation of TestEnv