Updated .travis.yml to fix CI issues.
Moved tests around.