Fix to Travis tests