Better implementation of attachingComments
Merged tests