Reverted some test changes in travis.yml