CS
First draft for unit testing