Make the tests pass 100% (with expected failures) on FreeBSD
Diff reduce with upstream and unbreak Makefile.inc1 with LOCAL_ITOOLS