Revert "test: De-~mut the test suite. rs=demuting"

This reverts commit f63efdc2100ff28e2a42600641835e7bd8bde591.