@stefanpenner @rwjblue this is ready for an initial review. Primary concern I have is the extent to test the instance-based approach, as I could duplicate all the current test helper tests, but that seems a bit ridiculous.