Trying again to fix broken tests.

Please don't merge this until the Travis build passes. :)