I remember this test to be explicitly to test for w=%s, so I don't think this is a good idea to change.