initial-data fixture for empty dbs (improved)

This reverts commit 6b7d84646676b896c4e75bc5b962ebc31588417a.
Merge pull request #2470 from washort/init-fixture

initial-data fixture for empty dbs (improved)