Fix patch paths, and remove tests (which fail in FIPS mode)