QAART-204 fix for messagewall test cases - 005 and 009