Fixed up DBTest cases