Fix tests after adding timeout.