More tweaks for running make test on travis