diff --git a/Tests/SQL-2012/Alignment_test1RowTable.sql b/Tests/SQL-2012/Alignment_test1RowTable.sql
index 9d67aa5..6b2ae77 100644
--- a/Tests/SQL-2012/Alignment_test1RowTable.sql
+++ b/Tests/SQL-2012/Alignment_test1RowTable.sql
@@ -34,7 +34,8 @@ BEGIN
 		ColumnId int,
 		ColumnName nvarchar(256),
 		ColumnType nvarchar(256),
-		SegmentElimination varchar(50),
+		SegmentElimination varchar(25) NOT NULL,
+		PredicatePushdown varchar(25) NOT NULL,
 		DealignedSegments int,
 		TotalSegments int,
 		SegmentAlignment Decimal(8,2)
@@ -55,9 +56,9 @@ BEGIN
 	-- NCI on HEAP
 	-- Insert expected result
 	insert into #ExpectedAlignment
-		(TableName, Location, Partition, [ColumnId], ColumnName, ColumnType, [SegmentElimination], [DealignedSegments], [TotalSegments], SegmentAlignment)
+		(TableName, Location, Partition, [ColumnId], ColumnName, ColumnType, [SegmentElimination], [PredicatePushdown], [DealignedSegments], [TotalSegments], SegmentAlignment)
 		values 
-		('[dbo].[OneRowNCI_Heap]', 'Disk-Based', 1,	1, 'c1', 'int', 'OK', 0, 1,	100.00 );
+		('[dbo].[OneRowNCI_Heap]', 'Disk-Based', 1,	1, 'c1', 'int', 'OK', 'OK', 0, 1,	100.00 );
 
 	insert into #ActualAlignment 
 		exec dbo.cstore_GetAlignment @tableName = 'OneRowNCI_Heap';
@@ -70,9 +71,9 @@ BEGIN
 	-- NCI on Clustered
 	-- Insert expected result
 	insert into #ExpectedAlignment
-		(TableName, Location, Partition, [ColumnId], ColumnName, ColumnType, [SegmentElimination], [DealignedSegments], [TotalSegments], SegmentAlignment)
+		(TableName, Location, Partition, [ColumnId], ColumnName, ColumnType, [SegmentElimination], [PredicatePushdown], [DealignedSegments], [TotalSegments], SegmentAlignment)
 		values 
-		('[dbo].[OneRowNCI_Clustered]', 'Disk-Based', 1, 1, 'c1', 'int', 'OK', 0, 1,	100.00 );
+		('[dbo].[OneRowNCI_Clustered]', 'Disk-Based', 1, 1, 'c1', 'int', 'OK', 'OK', 0, 1,	100.00 );
 
 	insert into #ActualAlignment 
 		exec dbo.cstore_GetAlignment @tableName = 'OneRowNCI_Clustered';
diff --git a/Tests/SQL-2012/Alignment_testEmptyTable.sql b/Tests/SQL-2012/Alignment_testEmptyTable.sql
index ca4270a..0fa96e4 100644
--- a/Tests/SQL-2012/Alignment_testEmptyTable.sql
+++ b/Tests/SQL-2012/Alignment_testEmptyTable.sql
@@ -31,7 +31,8 @@ BEGIN
 		ColumnId int,
 		ColumnName nvarchar(256),
 		ColumnType nvarchar(256),
-		SegmentElimination varchar(50),
+		SegmentElimination varchar(25) NOT NULL,
+		PredicatePushdown varchar(25) NOT NULL,
 		DealignedSegments int,
 		TotalSegments int,
 		SegmentAlignment Decimal(8,2)
diff --git a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_considerColumnsOver8K.sql b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_considerColumnsOver8K.sql
index a634805..b9333aa 100644
--- a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_considerColumnsOver8K.sql
+++ b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_considerColumnsOver8K.sql
@@ -32,6 +32,7 @@ BEGIN
 		[Compatible With] varchar(50) NOT NULL,
 		[TableLocation] varchar(15) NOT NULL,
 		[TableName] nvarchar(1000) NOT NULL,
+		[Partitions] int NOT NULL,
 		[Row Count] bigint NOT NULL,
 		[Min RowGroups] smallint NOT NULL,
 		[Size in GB] decimal(16,3) NOT NULL,
@@ -66,7 +67,7 @@ BEGIN
 		-- ******************************************************************************************************
 	-- Insert expected result for the 'Disk-Based' Index Location
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 	
 	insert into #ActualSuggestedTables
@@ -79,7 +80,7 @@ BEGIN
 	-- ******************************************************************************************************
 	-- Insert expected result for the 'Disk-Based' Index Location
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 	
 	insert into #ActualSuggestedTables
diff --git a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_indexLocation.sql b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_indexLocation.sql
index 8619157..61f299a 100644
--- a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_indexLocation.sql
+++ b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_indexLocation.sql
@@ -32,6 +32,7 @@ BEGIN
 		[Compatible With] varchar(50) NOT NULL,
 		[TableLocation] varchar(15) NOT NULL,
 		[TableName] nvarchar(1000) NOT NULL,
+		[Partitions] int NOT NULL,
 		[Row Count] bigint NOT NULL,
 		[Min RowGroups] smallint NOT NULL,
 		[Size in GB] decimal(16,3) NOT NULL,
@@ -66,7 +67,7 @@ BEGIN
 	-- ******************************************************************************************************
 	-- Insert expected result for the 'Disk-Based' Index Location
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 	
 	insert into #ActualSuggestedTables
diff --git a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_minRowsToConsider.sql b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_minRowsToConsider.sql
index e1142ff..775dbaf 100644
--- a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_minRowsToConsider.sql
+++ b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_minRowsToConsider.sql
@@ -32,6 +32,7 @@ BEGIN
 		[Compatible With] varchar(50) NOT NULL,
 		[TableLocation] varchar(15) NOT NULL,
 		[TableName] nvarchar(1000) NOT NULL,
+		[Partitions] int NOT NULL,
 		[Row Count] bigint NOT NULL,
 		[Min RowGroups] smallint NOT NULL,
 		[Size in GB] decimal(16,3) NOT NULL,
@@ -65,7 +66,7 @@ BEGIN
 
 	-- Insert expected result for 499999 rows
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 
 	insert into #ActualSuggestedTables
@@ -78,7 +79,7 @@ BEGIN
 	-- ******************************************************************************************************
 	-- Insert expected result for 500000 rows
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 
 	insert into #ActualSuggestedTables
diff --git a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_minSizeToConsiderInGB.sql b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_minSizeToConsiderInGB.sql
index a1b15a6..f8cce35 100644
--- a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_minSizeToConsiderInGB.sql
+++ b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_minSizeToConsiderInGB.sql
@@ -32,6 +32,7 @@ BEGIN
 		[Compatible With] varchar(50) NOT NULL,
 		[TableLocation] varchar(15) NOT NULL,
 		[TableName] nvarchar(1000) NOT NULL,
+		[Partitions] int NOT NULL,
 		[Row Count] bigint NOT NULL,
 		[Min RowGroups] smallint NOT NULL,
 		[Size in GB] decimal(16,3) NOT NULL,
@@ -66,7 +67,7 @@ BEGIN
 	-- ******************************************************************************************************
 	-- Insert expected result for 0.005 GB
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 
 	insert into #ActualSuggestedTables
@@ -79,7 +80,7 @@ BEGIN
 	-- ******************************************************************************************************
 	-- Insert expected result for 0.006 GB
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 
 	insert into #ActualSuggestedTables
diff --git a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_schemaName.sql b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_schemaName.sql
index 5d10d61..876caaf 100644
--- a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_schemaName.sql
+++ b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_schemaName.sql
@@ -32,6 +32,7 @@ BEGIN
 		[Compatible With] varchar(50) NOT NULL,
 		[TableLocation] varchar(15) NOT NULL,
 		[TableName] nvarchar(1000) NOT NULL,
+		[Partitions] int NOT NULL,
 		[Row Count] bigint NOT NULL,
 		[Min RowGroups] smallint NOT NULL,
 		[Size in GB] decimal(16,3) NOT NULL,
@@ -65,7 +66,7 @@ BEGIN
 
 	-- Insert expected result for the 'DB' Schema - the results should be empty
 	insert into #ActualSuggestedTables
-		exec dbo.cstore_SuggestedTables @schemaName = 'db', @tableName = 'SuggestedTables_Test1'
+		exec dbo.cstore_SuggestedTables @schemaName = 'dbx', @tableName = 'SuggestedTables_Test1'
 
 	exec tSQLt.AssertEqualsTable '#ExpectedSuggestedTables', '#ActualSuggestedTables';
 	TRUNCATE TABLE #ExpectedSuggestedTables;
@@ -75,7 +76,7 @@ BEGIN
 	-- ******************************************************************************************************
 	-- Insert expected result for the 'DBO' Schema
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 	
 	insert into #ActualSuggestedTables
diff --git a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_showReadyTablesOnly.sql b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_showReadyTablesOnly.sql
index 076a82a..bf78b06 100644
--- a/Tests/SQL-2012/SuggestedTables_testSimple500KTable_showReadyTablesOnly.sql
+++ b/Tests/SQL-2012/SuggestedTables_testSimple500KTable_showReadyTablesOnly.sql
@@ -32,6 +32,7 @@ BEGIN
 		[Compatible With] varchar(50) NOT NULL,
 		[TableLocation] varchar(15) NOT NULL,
 		[TableName] nvarchar(1000) NOT NULL,
+		[Partitions] int NOT NULL,
 		[Row Count] bigint NOT NULL,
 		[Min RowGroups] smallint NOT NULL,
 		[Size in GB] decimal(16,3) NOT NULL,
@@ -66,7 +67,7 @@ BEGIN
 	-- ******************************************************************************************************
 	-- Insert expected result for the 'Disk-Based' Index Location
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 	
 	insert into #ActualSuggestedTables
@@ -79,7 +80,7 @@ BEGIN
 	-- ******************************************************************************************************
 	-- Insert expected result for the 'Disk-Based' Index Location
 	insert into #ExpectedSuggestedTables
-		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 500000, 1, 0.006,	1, 0, 4,
+		select 'Nonclustered Columnstore', 'Disk-Based', '[dbo].[SuggestedTables_Test1]', 1, 500000, 1, 0.006,	1, 0, 4,
 				0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 0,*/ 0, 0, 0;
 	
 	insert into #ActualSuggestedTables