Minor fixes in testsuite