We were tolerating some unintentional ESI behaviour due to the
xml check hitting.

We now either avoid running into the xml check or specifically
test that we are hitting it.

In addition, add some logexpects to tighten checks