Update tests for new cloning conventions