edited couple unit tests commented