Swap content about

Slightly speculative change, based on what I think Ben means with his
email. If I got it wrong, they can shout at me.
Fix the tests broken by eec5d3c8