Tweak test error message and type