Updated tests to match DB changes.