WIP - Force unique test db

Waiting for other PR to be merged first.