Fix tests now that they're not using the minimal test template

There is now more than one form on the page, so we need to be more
specific in the tests about which one we're targetting.
Remove related placeholders.

This isn't using slimmer, so these serve no purpose.  Also remove the
Skip to related links as there's nothing to skip to.

Also move repeated stuff into layout.