Some comment and test fixes