Updates for travis testing