Feat/niggle fixes

Thanks for merging #9, and with that I'll offer a couple of small fixes. I've left them separate as it feels cleaner to me, but I'll squash them and re-push if it makes you happier.

Note that it will change the test output, as the test with the duplicate name wasn't being run.

Thanks,

James