Updated tests
Updated .travis.yml
Bug fixes
New tests