rework database testing to further increase db test isolation