More tweaks for make test on travis (#589)