diff --git a/schema/testdata.go b/schema/testdata.go
index 5570c6a..bd8b54c 100644
--- a/schema/testdata.go
+++ b/schema/testdata.go
@@ -12,7 +12,7 @@ import (
 	"github.com/apache/arrow/go/v13/arrow"
 	"github.com/apache/arrow/go/v13/arrow/array"
 	"github.com/apache/arrow/go/v13/arrow/memory"
-	"github.com/cloudquery/plugin-sdk/v3/types"
+	"github.com/cloudquery/plugin-sdk/v4/types"
 	"github.com/google/uuid"
 	"golang.org/x/exp/rand"
 	"golang.org/x/exp/slices"
@@ -21,7 +21,6 @@ import (
 // TestSourceOptions controls which types are included by TestSourceColumns.
 type TestSourceOptions struct {
 	SkipDates      bool
-	SkipDecimals   bool
 	SkipDurations  bool
 	SkipIntervals  bool
 	SkipLargeTypes bool // e.g. large binary, large string
@@ -31,16 +30,12 @@ type TestSourceOptions struct {
 	SkipTimes      bool // time of day types
 	SkipTimestamps bool // timestamp types. Microsecond timestamp is always be included, regardless of this setting.
 	TimePrecision  time.Duration
+	SkipDecimals   bool
 }
 
 // TestSourceColumns returns columns for all Arrow types and composites thereof. TestSourceOptions controls
 // which types are included.
 func TestSourceColumns(testOpts TestSourceOptions) []Column {
-	// cq columns
-	var cqColumns []Column
-	cqColumns = append(cqColumns, Column{Name: CqIDColumn.Name, Type: types.NewUUIDType(), NotNull: true, Unique: true, PrimaryKey: true})
-	cqColumns = append(cqColumns, Column{Name: CqParentIDColumn.Name, Type: types.NewUUIDType()})
-
 	var basicColumns []Column
 	basicColumns = append(basicColumns, primitiveColumns()...)
 	basicColumns = append(basicColumns, binaryColumns()...)
@@ -116,11 +111,10 @@ func TestSourceColumns(testOpts TestSourceOptions) []Column {
 		compositeColumns = append(compositeColumns, Column{Name: "struct", Type: arrow.StructOf(columnsToFields(basicColumns...)...)})
 
 		// struct with nested struct
-		compositeColumns = append(compositeColumns, Column{Name: "nested_struct", Type: arrow.StructOf(arrow.Field{Name: "inner", Type: arrow.StructOf(columnsToFields(basicColumns...)...)})})
+		// compositeColumns = append(compositeColumns, Column{Name: "nested_struct", Type: arrow.StructOf(arrow.Field{Name: "inner", Type: arrow.StructOf(columnsToFields(basicColumns...)...)})})
 	}
 
-	allColumns := append(append(cqColumns, basicColumns...), compositeColumns...)
-	return allColumns
+	return append(basicColumns, compositeColumns...)
 }
 
 // primitiveColumns returns a list of primitive columns as defined by Arrow types.
@@ -246,13 +240,7 @@ func columnsToFields(columns ...Column) []arrow.Field {
 
 // TestTable returns a table with columns of all types. Useful for destination testing purposes
 func TestTable(name string, testOpts TestSourceOptions) *Table {
-	var columns []Column
-	// columns = append(columns, Column{Name: "uuid", Type: types.NewUUIDType()})
-	// columns = append(columns, Column{Name: "string_pk", Type: arrow.BinaryTypes.String})
-	columns = append(columns, Column{Name: CqSourceNameColumn.Name, Type: arrow.BinaryTypes.String})
-	columns = append(columns, Column{Name: CqSyncTimeColumn.Name, Type: arrow.FixedWidthTypes.Timestamp_us})
-	columns = append(columns, TestSourceColumns(testOpts)...)
-	return &Table{Name: name, Columns: columns}
+	return &Table{Name: name, Columns: TestSourceColumns(testOpts)}
 }
 
 // GenTestDataOptions are options for generating test data