Fix CS & tests