 
     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
+    assert [{%RID{}, _}, {%RID{}, _}] = created
+    assert [{%RID{}, _}] = updated
 
     # Let's check the created records have actually been created.
     assert {:ok, %{response: [_, _]}}

  end

  test "unknown property ids are handled automatically with load_record/3", %{conn: c} do
    {:ok, %{response: cluster_id}} = command(c, "CREATE CLASS UnknownPropertyIdRecordLoad")
    {:ok, _} = command(c, "CREATE PROPERTY UnknownPropertyIdRecordLoad.i SHORT")

    doc = %Document{class: "UnknownPropertyIdRecordLoad", fields: %{"i" => 1}}
    {:ok, {rid, _}} = create_record(c, cluster_id, doc)

    assert {:ok, {loaded_doc, _}} = load_record(c, rid)
    assert loaded_doc.class == "UnknownPropertyIdRecordLoad"

  end

  test "unknown property ids after the first record", %{conn: c} do
    # TODO: affected by the cluster_id changes in 2.2.0-beta.

    {:ok, %{response: _cluster_id}} =
      command(c, "CREATE CLASS UnknownPropertyIds")

    {: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, %{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")
