Issue #5983: Modifying the test code