Ah, it could have been me copying over some of the other PR from months ago..  I'm also going to pull in @jachym WFS changes into this PR so they get integrated with the new test layout.