GH-3989 Unit tests for this PR