fix(tests): Travis rebase