Fix tests so Travis will pass.