Updated tests and added capability of sending empty CP