Fix Comment Test issues