ENH: Better tests

Ready for review/merge.

Closes #179.