more test tweaks for Travis