Fix unit tests.

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