Added comments to test cases.
Merging change from upstream.
Resolving diff