Made a start on 2 more tests, not complete