Issue #2391929 follow-up: Fixing/adding tests