Added more matrix tests