Bug 5347: Followup change class for message + Unit test