Fix more tests to match improved messages