Don't do "sloppy" error matching on our own tests (#1755)

Don't do "sloppy" error matching on our own tests (#1755) #610