Added tests

Addresses #30
I'm not going to comment on all the lines like this--just change it for all of them.