Another attempt at fixing travis build and tests