Two minor testsuite cleanups.