Minor mods to db test scripts.