Fix typo errors
Fix typo errors and add test comments