Improve coverage
Improve coverage
Rename integration tests
Merge branch 'TravisCI' into tox