changes with testsuite