Fixed merge issue
Updated expected classes for unit tests for Comments and Dependency