Options and test tweak for travis