fix-tests.diff
