Fix the unit-tests for the change in the template to mark the mandatory fields