Add travis ci fanciness and fix up tests