Fix ecount to use array?
Include test-diagonal
Add column-matrix constructor
Refactoring tests