Fix: Remaining test coverage use of Status Criterion