diff --git a/tests/delete_test.rs b/tests/delete_test.rs
index 3f25bec..3a8dd4e 100644
--- a/tests/delete_test.rs
+++ b/tests/delete_test.rs
@@ -11,16 +11,17 @@ use support::{setup_range, TestDocument};
 fn can_delete() {
     let data = "fred";
     let mut mtt = MoreThanText::new();
+    let client = mtt.client();
     let test_doc = TestDocument::new(vec![FieldType::StaticString]);
-    mtt.create_document(test_doc.get_docdef()).unwrap();
+    client.create_document(test_doc.get_docdef()).unwrap();
     test_doc.populate(mtt.clone(), vec![data]);
     let delete = Delete::new(test_doc.get_doc_name());
-    let result = mtt.records(delete).unwrap();
+    let result = client.records(delete).unwrap();
     assert_eq!(result.len(), 1);
     let rec = result.iter().last().unwrap();
     assert_eq!(rec.get(test_doc.get_field_name(0)).unwrap(), data.into());
     let qry = Query::new(test_doc.get_doc_name());
-    let qresult = mtt.records(qry).unwrap();
+    let qresult = client.records(qry).unwrap();
     assert_eq!(qresult.len(), 0);
 }
 
@@ -29,13 +30,14 @@ fn can_delete_specific() {
     let selected = 1;
     let (test_env, test_doc) = setup_range(3);
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     let mut calc = Calculation::new(Operand::Equal);
     calc.add_value(selected.clone()).unwrap();
     calc.add_value(CalcValue::Existing(FieldType::Integer))
         .unwrap();
     let mut delete = Delete::new(test_doc.get_doc_name());
     delete.get_query_mut().add(test_doc.get_field_name(0), calc);
-    let result = mtt.records(delete).unwrap();
+    let result = client.records(delete).unwrap();
     assert_eq!(result.len(), 1);
     let rec = result.iter().last().unwrap();
     assert_eq!(
@@ -43,7 +45,7 @@ fn can_delete_specific() {
         selected.into()
     );
     let qry = Query::new(test_doc.get_doc_name());
-    let qresult = mtt.records(qry).unwrap();
+    let qresult = client.records(qry).unwrap();
     assert_eq!(qresult.len(), 2);
     let mut expected: HashSet<Field> = HashSet::new();
     expected.insert(0.into());
@@ -68,13 +70,14 @@ fn can_delete_multiple() {
     let bound = selected + 1;
     let (test_env, test_doc) = setup_range(count.clone().try_into().unwrap());
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     let mut calc = Calculation::new(Operand::GreaterThan);
     calc.add_value(CalcValue::Existing(FieldType::Integer))
         .unwrap();
     calc.add_value(selected.clone()).unwrap();
     let mut delete = Delete::new(test_doc.get_doc_name());
     delete.get_query_mut().add(test_doc.get_field_name(0), calc);
-    let result = mtt.records(delete).unwrap();
+    let result = client.records(delete).unwrap();
     assert_eq!(result.len(), 2);
     let mut expected: HashSet<Field> = HashSet::new();
     for i in bound..count {
@@ -87,7 +90,7 @@ fn can_delete_multiple() {
     }
     assert_eq!(expected.len(), 0, "{:?} should have been deleted", expected);
     let qry = Query::new(test_doc.get_doc_name());
-    let qresult = mtt.records(qry).unwrap();
+    let qresult = client.records(qry).unwrap();
     assert_eq!(qresult.len(), bound.clone().try_into().unwrap());
     let mut qexpected: HashSet<Field> = HashSet::new();
     for i in 0..bound {
@@ -110,6 +113,7 @@ fn can_delete_multiple() {
 fn does_delete_error_on_a_bad_query() {
     let (test_env, test_doc) = setup_range(1);
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     let bad_name = Name::japanese("正しくない");
     let mut delete = Delete::new(test_doc.get_doc_name());
     let mut qry_calc = Calculation::new(Operand::Equal);
@@ -121,7 +125,7 @@ fn does_delete_error_on_a_bad_query() {
     let mut expected = MTTError::new(ErrorID::NameNotFound(bad_name.clone().into()));
     expected.add_parent(ErrorID::Field(bad_name.into()));
     expected.add_parent(ErrorID::Document(test_doc.get_doc_name().into()));
-    let result = mtt.records(delete).unwrap_err();
+    let result = client.records(delete).unwrap_err();
     assert_eq!(result.to_string(), expected.to_string());
 }
 
@@ -129,15 +133,18 @@ fn does_delete_error_on_a_bad_query() {
 fn does_delete_update_indexes() {
     let id = "something";
     let mut mtt = MoreThanText::new();
+    let client = mtt.client();
     let test_doc = TestDocument::new(vec![FieldType::StaticString]);
     let mut docdef = test_doc.get_docdef();
     docdef.add_index(&test_doc.get_field_name(0), IndexType::Unique);
-    mtt.create_document(docdef).unwrap();
+    client.create_document(docdef).unwrap();
     test_doc.populate(mtt.clone(), vec![id]);
-    mtt.records(Delete::new(test_doc.get_doc_name())).unwrap();
+    client
+        .records(Delete::new(test_doc.get_doc_name()))
+        .unwrap();
     let mut add = Addition::new(test_doc.get_doc_name());
     add.add_field(test_doc.get_field_name(0), id);
-    let result = mtt.records(add).unwrap();
+    let result = client.records(add).unwrap();
     assert_eq!(result.len(), 1);
     let rec = result.iter().last().unwrap();
     assert_eq!(rec.get(test_doc.get_field_name(0)).unwrap(), id.into());
@@ -148,6 +155,7 @@ fn does_delete_send_trigger() {
     let selected = 2;
     let (mut test_env, test_doc) = setup_range(3);
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     test_env.register_channel(vec![Path::new(
         Include::All,
         Include::Just(test_doc.get_doc_name().into()),
@@ -159,7 +167,7 @@ fn does_delete_send_trigger() {
         .unwrap();
     let mut delete = Delete::new(test_doc.get_doc_name());
     delete.get_query_mut().add(test_doc.get_field_name(0), calc);
-    let delete_result = mtt.records(delete).unwrap();
+    let delete_result = client.records(delete).unwrap();
     let trigger_result = test_env.get_trigger_records(Action::OnDelete);
     assert_eq!(trigger_result.len(), delete_result.len());
     assert_eq!(