Added lots more tests
Coverage up to 0.66