Changes related to move of testsuite