Addressed more code review test comments.