MDL-40697 mod_*: fixed unit tests so they pass