more db test refactoring