   end
 
   test "unknown property ids after the first record", %{conn: c} do
-    {:ok, %{response: cluster_id}} =
+    # TODO: affected by the cluster_id changes in 2.2.0-beta.
+
+    {:ok, %{response: _cluster_id}} =
       command(c, "CREATE CLASS UnknownPropertyIds")
 
-    {:ok, {rid1, _}} =
-      create_record(c, cluster_id, %Document{class: "UnknownPropertyIds", fields: %{"i" => 1}})
-
-    {:ok, _} =
+    {:ok, %{response: %Document{rid: rid1}}} =
+      command(c, "INSERT INTO UnknownPropertyIds(i) VALUES (1)")
+
+    {:ok, %{response: _property_id}} =
       command(c, "CREATE PROPERTY UnknownPropertyIds.str STRING")
 
-    {:ok, {rid2, _}} =
-      create_record(c,
-                    cluster_id,
-                    %Document{class: "UnknownPropertyIds", fields: %{"i" => 2, "str" => "value"}})
+    {:ok, %{response: %Document{rid: rid2}}} =
+      command(c, "INSERT INTO UnknownPropertyIds(i, str) VALUES (2, 'value')")
 
     assert {:ok, %{response: [doc1, doc2]}}
            = command(c, "SELECT FROM UnknownPropertyIds ORDER BY i ASC")


    assert {:ok, %{created: created, updated: updated}} = transaction(c, operations)

    assert [{%RID{cluster_id: ^cluster_id}, _}, {%RID{cluster_id: ^cluster_id}, _}]
           = created
    assert [{%RID{cluster_id: ^cluster_id}, _}] = updated

    # Let's check the created records have actually been created.
    assert {:ok, %{response: [_, _]}}

  end

  test "transactions", %{conn: c} do
    # TODO: affected by the cluster_id changes in 2.2.0-beta.

    {:ok, %{response: _cluster_id}} =
      command(c, "CREATE CLASS TransactionsTest")
    {:ok, %{response: [_doc1, doc2, doc3]}} =
      command(c, "INSERT INTO TransactionsTest(f) VALUES (1), (2), (3)")
