clone test fixes