Cleanup
Add coverage for travis