test: De-mut the test suite. rs=demuting