Update MatrixTest.java

Update to reflect changes to Matrix class, and introduction of MatrixCalculator.