diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts
index 759974d6a7..29c41ad985 100644
--- a/packages/server/src/api/controllers/table/index.ts
+++ b/packages/server/src/api/controllers/table/index.ts
@@ -78,9 +78,9 @@ export async function save(ctx: UserCtx<SaveTableRequest, SaveTableResponse>) {
   ctx.status = 200
   ctx.message = `Table ${table.name} saved successfully.`
   ctx.eventEmitter &&
-    ctx.eventEmitter.emitTable(`table:save`, appId, savedTable)
+    ctx.eventEmitter.emitTable(`table:save`, appId, { ...savedTable })
   ctx.body = savedTable
-  builderSocket?.emitTableUpdate(ctx, savedTable)
+  builderSocket?.emitTableUpdate(ctx, { ...savedTable })
 }
 
 export async function destroy(ctx: UserCtx) {
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index 44867e6b01..e521a5a6a6 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -557,6 +557,11 @@ class TestConfiguration {
     return this.updateTable(config, options)
   }
 
+  async getTable(tableId?: string) {
+    tableId = tableId || this.table!._id!
+    return this._req(null, { tableId }, controllers.table.find)
+  }
+
   async createLinkedTable(
     config?: Table,
     relationshipType = RelationshipType.ONE_TO_MANY,
@@ -607,6 +612,10 @@ class TestConfiguration {
     return this.api.row.save(tableId!, config)
   }
 
+  async getRow(tableId: string, rowId: string): Promise<Row> {
+    return this._req(null, { tableId, rowId }, controllers.row.find)
+  }
+
   async getRows(tableId: string) {
     if (!tableId && this.table) {
       tableId = this.table._id!