CS + Some unit-tests