simulate dual db system in tests.
minor changes to a helper class.
minor changes to a helper class.
doc updates