re-fix unix tool/test builds