Fix tests broken by #206e1af.
Merge pull request #27 from tysontate/master

Fix tests broken by #206e1af.