Test suite improvements

This fixes the long standing problem of tests timing out when not run in CI (see !1733 (closed))

I've folded in some other cleanups. @arun-mani-j maybe you can have a look.