Added more matrix test cases