tests updated. minor changes in comments