Issue #2416: Remove test code