add several more tests, add @cloneBeforeAdd option, on by default