The logic for part 2&3 for Section 6 redone

It should be either one or the other

Also the checkboxe metadata has been reverted so that it follows
the established convention where the options are capitalised
i.e. Yes/No.
Added the new pre filled in PDF form for tests
Copied form.pdf from master

Just to be extra pedantic, to make sure the file is fully halal.
Copied pre-filled PDF for tests