Added MatrixFilter + test