Added tests and functionality to CSC