minor comment and test fixes