Improve rundcicpp and change test1 to cutest format