Fix testing suite

Let's fix these tests. I'm sick of seeing a red "test failed" icon all the time :)

Fixes #488.

P.S. not yet ready for merge, just attaching here so Travis hits it.