Fix tests for #54 and add missing ones for full coverage

Hey @mmikeyy I hope you don't mind but I modified the tests to make #54 pass. Sorry, just eager to getting a patch release and definitely wanted to squeeze your changes in too.

@geekdave I added a few uncovered testing paths as well, no major stuff, just keeping that percentage up there.