diff --git a/tests/update_test.rs b/tests/update_test.rs
index d0f7bb3..16c9a54 100644
--- a/tests/update_test.rs
+++ b/tests/update_test.rs
@@ -14,6 +14,7 @@ fn is_it_possible_to_update_nothing() {
     let outside: i128 = (count + 2).try_into().unwrap();
     let (test_env, test_doc) = setup_range(count);
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     let mut update = Update::new(test_doc.get_doc_name());
     update.add_field(test_doc.get_field_name(0), 20);
     let mut calc = Calculation::new(Operand::Equal);
@@ -21,15 +22,16 @@ fn is_it_possible_to_update_nothing() {
     calc.add_value(CalcValue::Existing(FieldType::Integer))
         .unwrap();
     update.get_query_mut().add(test_doc.get_field_name(0), calc);
-    let result = mtt.records(update).unwrap();
+    let result = client.records(update).unwrap();
     assert_eq!(result.len(), 0);
 }
 
 #[test]
 fn does_it_update_information() {
     let mut mtt = MoreThanText::new();
+    let client = mtt.client();
     let test_doc = TestDocument::new(vec![FieldType::Uuid, FieldType::StaticString]);
-    mtt.create_document(test_doc.get_docdef());
+    client.create_document(test_doc.get_docdef());
     let field0 = Uuid::new_v4();
     let field1 = "new";
     let mut input: Vec<Field> = Vec::new();
@@ -52,8 +54,8 @@ fn does_it_update_information() {
         );
         assert_eq!(rec.get(test_doc.get_field_name(1)).unwrap(), field1.into());
     };
-    tester(mtt.records(update).unwrap());
-    tester(mtt.records(Query::new(test_doc.get_doc_name())).unwrap());
+    tester(client.records(update).unwrap());
+    tester(client.records(Query::new(test_doc.get_doc_name())).unwrap());
 }
 
 #[test]
@@ -63,6 +65,7 @@ fn are_the_updates_limited_to_the_queried() {
     let changed = 20;
     let (test_env, test_doc) = setup_range(count);
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     let mut update = Update::new(test_doc.get_doc_name());
     update.add_field(test_doc.get_field_name(0), changed.clone());
     let mut calc = Calculation::new(Operand::Equal);
@@ -70,7 +73,7 @@ fn are_the_updates_limited_to_the_queried() {
     calc.add_value(CalcValue::Existing(FieldType::Integer))
         .unwrap();
     update.get_query_mut().add(test_doc.get_field_name(0), calc);
-    let result = mtt.records(update).unwrap();
+    let result = client.records(update).unwrap();
     assert_eq!(result.len(), 1);
     let rec = result.iter().last().unwrap();
     assert_eq!(rec.get(test_doc.get_field_name(0)).unwrap(), changed.into());
@@ -78,7 +81,7 @@ fn are_the_updates_limited_to_the_queried() {
     expected.insert(0.into());
     expected.insert(2.into());
     expected.insert(20.into());
-    let docs = mtt.records(Query::new(test_doc.get_doc_name())).unwrap();
+    let docs = client.records(Query::new(test_doc.get_doc_name())).unwrap();
     for doc_data in docs.iter() {
         let id = doc_data.get(test_doc.get_field_name(0)).unwrap();
         expected.remove(&id);
@@ -98,6 +101,7 @@ fn can_multiple_documents_be_update() {
     let choice = 1;
     let (test_env, test_doc) = setup_range(count);
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     let mut add_up = Calculation::new(Operand::Add);
     add_up
         .add_value(CalcValue::Existing(FieldType::Integer))
@@ -110,7 +114,7 @@ fn can_multiple_documents_be_update() {
     calc.add_value(CalcValue::Existing(FieldType::Integer))
         .unwrap();
     update.get_query_mut().add(test_doc.get_field_name(0), calc);
-    let result = mtt.records(update).unwrap();
+    let result = client.records(update).unwrap();
     assert_eq!(result.len(), 2);
     for rec in result.iter() {
         assert!(rec.get(test_doc.get_field_name(0)).unwrap() > 10.into());
@@ -119,7 +123,7 @@ fn can_multiple_documents_be_update() {
     expected.insert(2.into());
     expected.insert(20.into());
     expected.insert(21.into());
-    let docs = mtt.records(Query::new(test_doc.get_doc_name())).unwrap();
+    let docs = client.records(Query::new(test_doc.get_doc_name())).unwrap();
     for doc_data in docs.iter() {
         let id = doc_data.get(test_doc.get_field_name(0)).unwrap();
         expected.remove(&id);
@@ -137,6 +141,7 @@ fn can_multiple_documents_be_update() {
 fn does_update_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 update = Update::new(test_doc.get_doc_name());
     let mut qry_calc = Calculation::new(Operand::Equal);
@@ -149,7 +154,7 @@ fn does_update_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(update).unwrap_err();
+    let result = client.records(update).unwrap_err();
     assert_eq!(result.to_string(), expected.to_string());
 }
 
@@ -157,6 +162,7 @@ fn does_update_error_on_a_bad_query() {
 fn does_update_error_on_a_bad_field_name() {
     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 update = Update::new(test_doc.get_doc_name());
     let mut qry_calc = Calculation::new(Operand::Equal);
@@ -171,7 +177,7 @@ fn does_update_error_on_a_bad_field_name() {
     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(update).unwrap_err();
+    let result = client.records(update).unwrap_err();
     assert_eq!(result.to_string(), expected.to_string());
 }
 
@@ -179,6 +185,7 @@ fn does_update_error_on_a_bad_field_name() {
 fn does_update_error_on_a_bad_field_type() {
     let (test_env, test_doc) = setup_range(1);
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     let mut update = Update::new(test_doc.get_doc_name());
     let mut qry_calc = Calculation::new(Operand::Equal);
     qry_calc.add_value(0).unwrap();
@@ -192,24 +199,25 @@ fn does_update_error_on_a_bad_field_type() {
     let mut expected = MTTError::new(ErrorID::FieldTypeExpected(FieldType::Integer));
     expected.add_parent(ErrorID::Field(test_doc.get_field_name(0).into()));
     expected.add_parent(ErrorID::Document(test_doc.get_doc_name().into()));
-    let result = mtt.records(update).unwrap_err();
+    let result = client.records(update).unwrap_err();
     assert_eq!(result.to_string(), expected.to_string());
 }
 
 #[test]
 fn does_update_maintain_unique_index() {
     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);
+    client.create_document(docdef);
     let old_data = "old";
     let new_data = "new";
     test_doc.populate(mtt.clone(), vec![old_data]);
     let mut update = Update::new(test_doc.get_doc_name());
     update.add_field(test_doc.get_field_name(0), new_data);
-    mtt.records(update).unwrap();
-    let result = mtt.records(Query::new(test_doc.get_doc_name())).unwrap();
+    client.records(update).unwrap();
+    let result = client.records(Query::new(test_doc.get_doc_name())).unwrap();
     assert_eq!(result.len(), 1);
     let rec = result.iter().last().unwrap();
     assert_eq!(
@@ -221,11 +229,11 @@ fn does_update_maintain_unique_index() {
     let mut err = MTTError::new(ErrorID::IndexEntryAlreadyExists(new_data.into()));
     err.add_parent(ErrorID::Field(test_doc.get_field_name(0).into()));
     err.add_parent(ErrorID::Document(test_doc.get_doc_name().into()));
-    let error = mtt.records(add_new).unwrap_err();
+    let error = client.records(add_new).unwrap_err();
     assert_eq!(error.to_string(), err.to_string());
     let mut add_old = Addition::new(test_doc.get_doc_name());
     add_old.add_field(test_doc.get_field_name(0), old_data);
-    let result = mtt.records(add_old).unwrap();
+    let result = client.records(add_old).unwrap();
     assert_eq!(result.len(), 1);
     let add_rec = result.iter().last().unwrap();
     assert_eq!(
@@ -237,23 +245,24 @@ fn does_update_maintain_unique_index() {
 #[test]
 fn does_index_remain_unchanged_on_update_failure() {
     let mut mtt = MoreThanText::new();
+    let client = mtt.client();
     let test_doc = TestDocument::new(vec![FieldType::StaticString, FieldType::StaticString]);
     let mut docdef = test_doc.get_docdef();
     docdef.add_index(&test_doc.get_field_name(0), IndexType::Unique);
-    mtt.create_document(docdef);
+    client.create_document(docdef);
     let id = "one";
     test_doc.populate(mtt.clone(), vec!["one", "data"]);
     let mut update = Update::new(test_doc.get_doc_name());
     update.add_field(test_doc.get_field_name(0), "two");
     update.add_field(test_doc.get_field_name(1), 2);
-    mtt.records(update).unwrap_err();
+    client.records(update).unwrap_err();
     let mut add = Addition::new(test_doc.get_doc_name());
     add.add_field(test_doc.get_field_name(0), id);
     add.add_field(test_doc.get_field_name(1), "something");
     let mut err = MTTError::new(ErrorID::IndexEntryAlreadyExists(id.into()));
     err.add_parent(ErrorID::Field(test_doc.get_field_name(0).into()));
     err.add_parent(ErrorID::Document(test_doc.get_doc_name().into()));
-    let error = mtt.records(add).unwrap_err();
+    let error = client.records(add).unwrap_err();
     assert_eq!(error.to_string(), err.to_string());
 }
 
@@ -262,10 +271,11 @@ fn does_index_remain_unchanged_on_update_failure() {
 fn does_update_error_when_it_overrides_unique_index() {
     let count = 3;
     let mut mtt = MoreThanText::new();
+    let client = mtt.client();
     let test_doc = TestDocument::new(vec![FieldType::Integer]);
     let mut docdef = test_doc.get_docdef();
     docdef.add_index(&test_doc.get_field_name(0), IndexType::Unique);
-    mtt.create_document(docdef);
+    client.create_document(docdef);
     let mut input: Vec<Vec<i128>> = Vec::new();
     for i in 0..count {
         input.push(vec![i]);
@@ -277,7 +287,7 @@ fn does_update_error_when_it_overrides_unique_index() {
     let mut err = MTTError::new(ErrorID::IndexEntryAlreadyExists(new_data.into()));
     err.add_parent(ErrorID::Field(test_doc.get_field_name(0).into()));
     err.add_parent(ErrorID::Document(test_doc.get_doc_name().into()));
-    let result = mtt.records(update).unwrap_err();
+    let result = client.records(update).unwrap_err();
     assert_eq!(result.to_string(), err.to_string());
     for i in 0..count {
         let mut calc = Calculation::new(Operand::Equal);
@@ -286,7 +296,7 @@ fn does_update_error_when_it_overrides_unique_index() {
             .unwrap();
         let mut qry = Query::new(test_doc.get_doc_name());
         qry.add(test_doc.get_field_name(0), calc);
-        let holder = mtt.records(qry).unwrap();
+        let holder = client.records(qry).unwrap();
         assert_eq!(holder.len(), 1);
         let rec = holder.iter().last().unwrap();
         assert_eq!(rec.get(test_doc.get_field_name(0)).unwrap(), i.into());
@@ -298,6 +308,7 @@ fn does_update_send_on_update_message() {
     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()),
@@ -310,7 +321,7 @@ fn does_update_send_on_update_message() {
     let mut update = Update::new(test_doc.get_doc_name());
     update.get_query_mut().add(test_doc.get_field_name(0), calc);
     update.add_field(test_doc.get_field_name(0), 5);
-    let update_result = mtt.records(update).unwrap();
+    let update_result = client.records(update).unwrap();
     let trigger_result = test_env.get_trigger_records(Action::OnUpdate);
     assert_eq!(trigger_result.len(), update_result.len());
     assert_eq!(