Change to use auto-generated clone interfaces.

(Some tests are deleted)