Further updates to db test scripts.