Anahkiasen/former — pull request #301 by claar (2014-04-11 22:18:11+00:00)
Title: Fix unit tests.

Pull request #298 (#78ffc24) broke Travis CI builds -- this patch fixes them.