mid refactor DB testing woes :confounded: