Added basis for test of legacy vs. current db