Fix-test-failures.patch
