Updates travis config
Updates tests