Add more options to clone test