Fix test comments and add test for validation