Travis config tweak and test fix