Progress on db tests
DB tests passing