Matrix composite test now builds the whole matrix, need to add in a new method so that we can fill the matrix in a nice way.