Fix tests so they might work in travis