Should be ready for non-churn test