Updated message generators and removed ShouldNotBeUnique