Added extra tests for commenting