unit test cp fix
Examples cleanup and minor fixes
sync