Various minor improvements on testsuite.