Bug 8486 - Follow up making the tests db independent