Added tests

Addresses #30
Ah, got it! Thanks for the feedback. Fixing for the one above too.