Revert "Clone test fix"

This reverts commit 2e3955f8b1bc9f786179a050c53061824bbdeef0.