Move cloning to before
Move deletion test to top level