minor testsuite fixes