Fix CS & tests & address comment's