Merge pull request #15877 from demeritcowboy/casereport-unittest