Adding the rest of the Matrix Vector defintion. Also tidied up the test script somewhat