More work on tests
Travis config