Applied patch to fix testsuite