Fixed unit tests by shimming new messages