Revert 31791
supersedes #31800

we never back ported this so just cleaning up master (assuming it now works again)
one npdev fail left thanks @WillAyd  Why did we revert this? 

We are testing all external error messages, IMO there is no point in testing those so detailed (each time a package changes the wording slightly, our tests will start failing) not all of these are external , they need to be separated into 2 lists 

