Fixup of a problem in Matrix's test case