patches applied to yi / testsuite /