Fixed a couple of tests failures (one left)
Database queue was never provided key for underlying db