Fix Test Failures due to redefine error message