Added several more test matrices