Updated tests

From here on out, I would propose to always commit tests with code changes.

These particular tests are pulled over from #37, with discussion in #33.