Added tests; Expected exceptions; Fixed bug in Cel