Some comment test fixes