Comment and tests fixed