Confirmable fix for tests and pagination deprecation mitigation