Fixed tests and zombie expiry.
adjustments.