Test Helper: Revert change limiting per status
Test Helper: Yet another compatibility change