Added a few tests. Unfortunately, I can't get Travis to run them automatically as I wanted.