Test fixes
Update to travis config