Better format for error messages
Restored expect_that in normal tests
Improvements for db.q

let db.q handle interrupt nicely