More tweaks to the test suite tol'