Further tweaking of the test suite