We now have better error messages, so fix the tests to account for that. Patch by leper. This was SVN commit r18683.