Got rid of obsolete matrix test