Added Testing and other stuff to CDR