Updated CS on unit tests