Feature/fix tests

Update travis configuration and fix some tests