Initial test structure
Implement tests
Merge branch 'travis'