Refactor subscriber report spec
Merge pull request #299 from neighborly/jl-refactor-subscriber-report-spec

Refactor subscriber report spec