Matrix: some tests fixed