fixing testsuite more