setup a few tests
fix travis
Merge branch 'feature/testing' into develop