Updated DB test to reflect reorganization