final comments to testcode
merge