Add timeout to make consistent with tests