Comments added according Jira tickets

All tests passed