Refactor subscriber report spec