DB Redo

Minor re-do of test database