Write a unit test that handles both cases to create the matrix aggregator.
Are you still intending to work on this?