Add some Matrix testing and make it pass.