Issue #2335991 follow-up: Adding tests