Pr2081 review 3

Another PR for fast travis tests