refactor testsuite environment