Fix comments
Tests and .travis.yml