Following the commit 7fad2a62d4
7fad2a62d4
And make unit test error message more explicit. Close #12627