This does seem to be a good way to organize datasets.  It is now tested with unit tests.