MDL-40697 mod_*: altered existing unit tests so they pass