Fixing some test failures found by Travis-CI