registration-extra-fields: Cosmetic changes from code review

* Rather than defining a tos_not_required variable and testing not
  tos_not_required, define a tos_required variable and check
  not tos_required
* Indent of dictionary declaration
* Inline code from methods used only once in tests