Testing changes to ensure message safety