Fix failing test, and update travis CI build config