Add test coverage.
Merge branch 'travis'