Fix up tests for nested input/labels.

Fixup nested inputs and add a new test showing how you can update the
templates to have non-nested inputs.