Message tests reorganized