Refactor of broken test on travis 2