GWDP-685, insert data dictionary even if no data files requested.

Plus clean up one test.