make all pass after tweaking the mod_tools