More test matrix mods