Cleaned up the Travis CI script and various unit tests