[heroku] Refactor test data collection

[hwine]

Since the automation was built from prior scripts, they aren't structured the "natural" way yet. Getting that straightened out should be done before additional tests are added for this service.