DB testing tweaks