Minor cleanups to test comments.