Add workaround for unfortunate interaction between DB creation & test cleanup logic