Use html instead of clone.  Update tests.