MatrixWithGeneric done; Tests done;