Merge "fortify: fix tests on x86_64"