ENH: Better tests

Ready for review/merge.

Closes #179.
There was a typo in that last commit, this is *actually* the new line...