obsolete comment removed
tests fixed