Merge "Revert "Large matrix test""