Fix unit test failures reported by Travis