Added more tests.  Coverage up to 61% now