Added some more tests, and got coverage working nicely