Some cleanup
Fixing another test where the error message has changed