Add test for instantiation with empty data store
Regroup tests