Added comment tests.
Fixed merge conflict with Comments