[IMP-dev] patch to fix test error message paths