Fix test case to correspond with CC mods, where we don't build leaf nodes for single docs
New configuration scheme, should make it easier to add keys