fix tests & fix CS