Clean based in prep for travis tests
Minimal tests to ensure build passes
Merge pull request #999 from remy/feature/tests-YES-TESTS

Feature/tests yes tests