Fixed tests and CS