Issue #5933: Remove test code