Also, fixup and clean up the tests so that the pass...  minor edits
to support my custom config, and drop a couple tests as those are
tested in another test...