Got the arguments accurately being assigned from a template.
Broke out a lot of support code to a fixture to support the other add handler tests.
Adjusted template field strategy a little bit.