Now changed all unit test cases to match what Sam has written for us