test refactors / travis tweaks