Fixes #217. Like Patrick says: "Yay for Unit Tests!"