add comments to fix tests
Merge branch 'devel'