Issue #2416: Repair of getter setter, remove the test code