some general nits.
some general nits.

Summary: test refactor to allow parallel runs. other minor fixes

Test Plan: unit tests

Reviewers: joy

Reviewed By: joy

CC: Engineering

Differential Revision: https://phabricator.poptip.com/D2951