Fix CS and add test