add tests, change new clone numbering mechanics