Matrix: Expose internal structure per instance
Expose internal representation, fix tests