Should fix #109.
Flesh out the tests a little more.