This change cleans up a few of the fixtures used in the test suite to be more consistent and also renames ambiguous helper classes.
