Misc

Here's some commits that add more tests (that can't be run on travis) and make things a little more user friendly.

This should be merged after #124, because one of the tests uses 'exec'.