Fix test and CS