diff --git a/package.json b/package.json
index d3dd0cfc4e..50bc115324 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
 			"**/*.d.ts",
 			"output/",
 			"packages/cli/templates/**/files/",
-			"packages/igx-templates/",
+			"packages/igx-templates/**/files/",
 			"packages/igniteui-mcp/"
 		],
 		"reporter": [
diff --git a/packages/cli/lib/commands/doc.ts b/packages/cli/lib/commands/doc.ts
index cef33ff543..98cc56a6c2 100644
--- a/packages/cli/lib/commands/doc.ts
+++ b/packages/cli/lib/commands/doc.ts
@@ -15,7 +15,7 @@ const doc: DocCommandType = {
 	},
 	open: async (target) => {
 		const open = await import("open");
-		open.default.call(target);
+		await open.default(target);
 	},
 	async handler(argv: ArgumentsCamelCase<PositionalArgs>) {
 		GoogleAnalytics.post({
diff --git a/packages/core/util/ProjectConfig.ts b/packages/core/util/ProjectConfig.ts
index fd07d39f35..e07f27a2d9 100644
--- a/packages/core/util/ProjectConfig.ts
+++ b/packages/core/util/ProjectConfig.ts
@@ -91,7 +91,7 @@ export class ProjectConfig {
 
 		const result = { message: undefined, valid: false, value: undefined };
 		if (!schema.properties.hasOwnProperty(property)) {
-			result.message = `Property "${property}" is not allowed in "${schema.title}" type!`;
+			result.message = `Property "${property}" is not allowed in the Ignite UI CLI configuration!`;
 			return  result;
 		}
 
diff --git a/packages/igx-templates/igx-ts/grid/grid-custom/index.ts b/packages/igx-templates/igx-ts/grid/grid-custom/index.ts
index 778733801e..9836e847ba 100644
--- a/packages/igx-templates/igx-ts/grid/grid-custom/index.ts
+++ b/packages/igx-templates/igx-ts/grid/grid-custom/index.ts
@@ -81,9 +81,10 @@ class IgxCustomGridTemplate extends IgniteUIForAngularTemplate {
 			const featuresUrls = [];
 			for (const feature of this.userExtraConfiguration["columnFeatures"] as string[]) {
 				switch (feature) {
-					case "Sorting":
 					case "Filtering":
 						gridFeatures.push(`[allowFiltering]="true"`);
+						// falls through
+					case "Sorting":
 					case "Resizing":
 						const text = `[${feature.toLowerCase().replace("ing", "able")}]="true"`;
 						columnFeatures.push(text);
diff --git a/packages/igx-templates/igx-ts/grid/multi-column-headers/index.ts b/packages/igx-templates/igx-ts/grid/multi-column-headers/index.ts
index 07a82df2bf..38fa04d834 100644
--- a/packages/igx-templates/igx-ts/grid/multi-column-headers/index.ts
+++ b/packages/igx-templates/igx-ts/grid/multi-column-headers/index.ts
@@ -24,7 +24,7 @@ class IgxMultiColumnHeadersTemplate extends IgniteUIForAngularTemplate {
 
 	public getExtraConfiguration(): ControlExtraConfiguration[] {
 		return [{
-			choices: ["Sorting", "Filtering", "Resizing", "Paging", "Column Pinning", "Moving"],
+			choices: ["Sorting", "Filtering", "Resizing", "Paging", "Moving"],
 			default: "",
 			key: "columnFeatures",
 			message: "Choose features for the igx-grid",
@@ -49,11 +49,13 @@ class IgxMultiColumnHeadersTemplate extends IgniteUIForAngularTemplate {
 					case "Sorting":
 					case "Filtering":
 					case "Resizing":
-					case "Moving":
 						const text = `[${feature.toLowerCase().replace("ing", "able")}]="true"`;
 						columnFeatures.push(text);
 						columnBoolFeatures.push(text);
 						break;
+					case "Moving":
+						gridFeatures.push(`[moving]="true"`);
+						break;
 					case "Row Selection":
 						const gridFeatureText = `rowSelection="multiple"`;
 						gridFeatures.push(gridFeatureText);
diff --git a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/index.ts b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/index.ts
index 1cd53d2e91..47eb64ae13 100644
--- a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/index.ts
+++ b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/index.ts
@@ -1,7 +1,20 @@
-import { ControlExtraConfigType, ControlExtraConfiguration } from "@igniteui/cli-core";
+import { ControlExtraConfigType, ControlExtraConfiguration, TemplateDependency } from "@igniteui/cli-core";
 import { IgniteUIForAngularTemplate } from "../../../IgniteUIForAngularTemplate";
 import { IGNITEUI_ANGULAR_PACKAGE } from "../../../constants";
 
+const BASE_DEPENDENCIES: TemplateDependency[] = [
+	{
+		import: [
+			"IgxHierarchicalGridComponent",
+			"IgxRowIslandComponent",
+			"IgxColumnComponent",
+			"IgxIconComponent"
+		],
+		from: "<%=igxPackage%>",
+		standalone: true
+	}
+];
+
 class IgxHierarchicalGridTemplate extends IgniteUIForAngularTemplate {
 	private userExtraConfiguration = {};
 	private usePinning: boolean;
@@ -16,18 +29,7 @@ class IgxHierarchicalGridTemplate extends IgniteUIForAngularTemplate {
 		this.projectType = "igx-ts";
 		this.name = "Custom Hierarchical Grid";
 		this.description = "a customizable IgxHierarchicalGrid";
-		this.dependencies = [
-			{
-				import: [
-					"IgxHierarchicalGridComponent",
-					"IgxRowIslandComponent",
-					"IgxColumnComponent",
-					"IgxIconComponent"
-				],
-				from: "<%=igxPackage%>",
-				standalone: true
-			}
-		];
+		this.dependencies = [...BASE_DEPENDENCIES];
 		this.packages = [IGNITEUI_ANGULAR_PACKAGE];
 		this.hasExtraConfiguration = true;
 	}
@@ -48,6 +50,10 @@ class IgxHierarchicalGridTemplate extends IgniteUIForAngularTemplate {
 	}
 
 	public generateConfig(name: string, ...options: any[]): {[key: string]: any} {
+		// the template instance is shared, so reset state left over from previous calls
+		this.usePinning = false;
+		this.additionalElements = [""];
+		this.dependencies = [...BASE_DEPENDENCIES];
 		const columnFeatures = [];
 		const gridFeatures = [];
 		const extraConfig = {
@@ -139,57 +145,57 @@ class IgxHierarchicalGridTemplate extends IgniteUIForAngularTemplate {
 				}
 
 				featuresUrls.push(this.getFeatureUrl(feature, featureUrl));
-				selectedFeatures = features.map((e, i) => {
-					anchorWrapper.href = featuresUrls[i];
-					anchorWrapper.text = e;
-					return ` ${anchorWrapper.start}${anchorWrapper.href}${anchorWrapper.middle}` +
-						`${anchorWrapper.text}${anchorWrapper.end}`;
-				}).toString();
-				if (selectedFeatures.length > 0) {
-					selectedFeatures = `<p>Active Features: ${selectedFeatures}</p>`;
-				}
-				if (toolbarActions.length) {
-					this.dependencies = [
-						...this.dependencies,
-						...[
-							{
-								standalone: true,
-								import: "IgxGridToolbarComponent",
-								from: "<%=igxPackage%>"
-							},
-							{
-								standalone: true,
-								import: "IgxGridToolbarTitleComponent",
-								from: "<%=igxPackage%>"
-							},
-							{
-								standalone: true,
-								import: "IgxGridToolbarActionsComponent",
-								from: "<%=igxPackage%>"
-							},
-							{
-								standalone: true,
-								import: "IgxGridToolbarPinningComponent",
-								from: "<%=igxPackage%>"
-							},
-							{
-								standalone: true,
-								import: "IgxGridToolbarHidingComponent",
-								from: "<%=igxPackage%>"
-							},
-						],
-					];
+			}
+			selectedFeatures = features.map((e, i) => {
+				anchorWrapper.href = featuresUrls[i];
+				anchorWrapper.text = e;
+				return ` ${anchorWrapper.start}${anchorWrapper.href}${anchorWrapper.middle}` +
+					`${anchorWrapper.text}${anchorWrapper.end}`;
+			}).toString();
+			if (selectedFeatures.length > 0) {
+				selectedFeatures = `<p>Active Features: ${selectedFeatures}</p>`;
+			}
+			if (toolbarActions.length) {
+				this.dependencies = [
+					...this.dependencies,
+					...[
+						{
+							standalone: true,
+							import: "IgxGridToolbarComponent",
+							from: "<%=igxPackage%>"
+						},
+						{
+							standalone: true,
+							import: "IgxGridToolbarTitleComponent",
+							from: "<%=igxPackage%>"
+						},
+						{
+							standalone: true,
+							import: "IgxGridToolbarActionsComponent",
+							from: "<%=igxPackage%>"
+						},
+						{
+							standalone: true,
+							import: "IgxGridToolbarPinningComponent",
+							from: "<%=igxPackage%>"
+						},
+						{
+							standalone: true,
+							import: "IgxGridToolbarHidingComponent",
+							from: "<%=igxPackage%>"
+						},
+					],
+				];
 
-					const parts = [
-						"  <igx-grid-toolbar>",
-						"    <igx-grid-toolbar-title>Singers</igx-grid-toolbar-title>",
-						"    <igx-grid-toolbar-actions>",
-						...toolbarActions,
-						"    </igx-grid-toolbar-actions>",
-						"  </igx-grid-toolbar>"
-					];
-					this.additionalElements.splice(1, 0, parts.join("\n"));
-				}
+				const parts = [
+					"  <igx-grid-toolbar>",
+					"    <igx-grid-toolbar-title>Singers</igx-grid-toolbar-title>",
+					"    <igx-grid-toolbar-actions>",
+					...toolbarActions,
+					"    </igx-grid-toolbar-actions>",
+					"  </igx-grid-toolbar>"
+				];
+				this.additionalElements.splice(1, 0, parts.join("\n"));
 			}
 		}
 
diff --git a/packages/ng-schematics/src/utils/cli-config.spec.ts b/packages/ng-schematics/src/utils/cli-config.spec.ts
new file mode 100644
index 0000000000..8dde055ed0
--- /dev/null
+++ b/packages/ng-schematics/src/utils/cli-config.spec.ts
@@ -0,0 +1,39 @@
+import { EmptyTree, SchematicContext, SchematicsException } from "@angular-devkit/schematics";
+import { UnitTestTree } from "@angular-devkit/schematics/testing";
+import { createCliConfig } from "./cli-config";
+
+describe("createCliConfig", () => {
+	let tree: UnitTestTree;
+	let context: SchematicContext;
+	let rule: (tree: UnitTestTree, context: SchematicContext) => Promise<void>;
+
+	beforeEach(() => {
+		tree = new UnitTestTree(new EmptyTree());
+		context = {
+			logger: jasmine.createSpyObj("logger", ["info", "warn"])
+		} as unknown as SchematicContext;
+		rule = createCliConfig() as (tree: UnitTestTree, context: SchematicContext) => Promise<void>;
+	});
+
+	it("should report a missing angular.json", async () => {
+		await expectAsync(rule(tree, context))
+			.toBeRejectedWithError(SchematicsException, "angular.json was not found in the project's root");
+		expect(tree.exists("ignite-ui-cli.json")).toBeFalse();
+	});
+
+	it("should report a missing angular.json when the root has other files", async () => {
+		tree.create("package.json", "{}");
+
+		await expectAsync(rule(tree, context))
+			.toBeRejectedWithError(SchematicsException, "angular.json was not found in the project's root");
+		expect(tree.exists("ignite-ui-cli.json")).toBeFalse();
+	});
+
+	it("should rethrow other workspace read errors", async () => {
+		tree.create("angular.json", "{ not json");
+
+		await expectAsync(rule(tree, context))
+			.toBeRejectedWithError(Error, "Unknown format - version specifier not found.");
+		expect(tree.exists("ignite-ui-cli.json")).toBeFalse();
+	});
+});
diff --git a/packages/ng-schematics/src/utils/cli-config.ts b/packages/ng-schematics/src/utils/cli-config.ts
index 4df8e5ea09..0b2ad218b9 100644
--- a/packages/ng-schematics/src/utils/cli-config.ts
+++ b/packages/ng-schematics/src/utils/cli-config.ts
@@ -23,7 +23,9 @@ async function GetCliConfig(tree: Tree): Promise<Config> {
 	try {
 		({ workspace } = await workspaces.readWorkspace("/", createWorkspaceHost(tree)));
 	} catch (e) {
-		if (e.toString().includes("Could not find (undefined)")) {
+		const message = e.toString();
+		if (message.includes("Unable to determine format for workspace path") ||
+			message.includes("Unable to locate a workspace file")) {
 			throw new SchematicsException("angular.json was not found in the project's root");
 		}
 		throw new Error(e.message);
diff --git a/spec/helpers/utils.ts b/spec/helpers/utils.ts
index 301a9f2ed3..c7531705d9 100644
--- a/spec/helpers/utils.ts
+++ b/spec/helpers/utils.ts
@@ -47,3 +47,14 @@ export function filesDiff(
 export function resetSpy(spy: any) {
 	(spy as jasmine.Spy).calls.reset();
 }
+
+/**
+ * Loads a fresh copy of a module, bypassing the require cache.
+ * Use for modules that export a stateful singleton, like template instances.
+ * @param modulePath Absolute path to the module
+ */
+export function requireFresh<T>(modulePath: string): T {
+	const resolved = require.resolve(modulePath);
+	delete require.cache[resolved];
+	return require(resolved);
+}
diff --git a/spec/unit/IgniteUIForReactTemplate-spec.ts b/spec/unit/IgniteUIForReactTemplate-spec.ts
new file mode 100644
index 0000000000..f4bbdc56be
--- /dev/null
+++ b/spec/unit/IgniteUIForReactTemplate-spec.ts
@@ -0,0 +1,47 @@
+import { Util } from "@igniteui/cli-core";
+import { IgniteUIForReactTemplate } from "../../packages/cli/lib/templates/IgniteUIForReactTemplate";
+
+describe("Unit - IgniteUIForReactTemplate", () => {
+	let template: IgniteUIForReactTemplate;
+
+	beforeEach(() => {
+		spyOn(Util, "version").and.returnValue("1.0.0");
+		template = new IgniteUIForReactTemplate("root/path");
+	});
+
+	describe("generateConfig", () => {
+		it("generates the base variables from the component name", () => {
+			const config = template.generateConfig("my component", {});
+
+			expect(config).toEqual({
+				path: "my-component",
+				name: "my component",
+				ClassName: "MyComponent",
+				filePrefix: "my-component",
+				cliVersion: "1.0.0"
+			});
+		});
+
+		it("merges the extra configuration into the generated config", () => {
+			const config = template.generateConfig("my component", {
+				extraConfig: { selectionType: "multi", name: "overridden" }
+			});
+
+			expect(config["selectionType"]).toBe("multi");
+			// base variables take precedence over extra configuration
+			expect(config["name"]).toBe("my component");
+			expect(config["ClassName"]).toBe("MyComponent");
+		});
+
+		it("adds widget and description variables when set", () => {
+			template["widget"] = "igr-grid";
+			template.description = "Test description";
+
+			const config = template.generateConfig("my component", {});
+
+			expect(config["widget"]).toBe("igr-grid");
+			expect(config["Control"]).toBe("IgrGrid");
+			expect(config["description"]).toBe("Test description");
+		});
+	});
+});
diff --git a/spec/unit/ProjectConfig-spec.ts b/spec/unit/ProjectConfig-spec.ts
index 5bea463156..360b5358e6 100644
--- a/spec/unit/ProjectConfig-spec.ts
+++ b/spec/unit/ProjectConfig-spec.ts
@@ -43,4 +43,12 @@ describe("Unit - ProjectConfig", () => {
 		expect(ProjectConfig.hasLocalConfig()).toBeTruthy();
 		expect(fs.statSync).toHaveBeenCalledTimes(1);
 	});
+
+	it("validateProperty rejects properties that are not in the schema", () => {
+		const result = ProjectConfig.validateProperty("notAConfigProperty", "value");
+		expect(result.valid).toBeFalse();
+		expect(result.value).toBeUndefined();
+		expect(result.message)
+			.toBe(`Property "notAConfigProperty" is not allowed in the Ignite UI CLI configuration!`);
+	});
 });
diff --git a/spec/unit/doc-spec.ts b/spec/unit/doc-spec.ts
index e96f0e4c36..35821a8753 100644
--- a/spec/unit/doc-spec.ts
+++ b/spec/unit/doc-spec.ts
@@ -42,4 +42,18 @@ describe("Unit - Doc command", () => {
 		expect(Util.error).toHaveBeenCalledWith("The search term 'Th1s i$ incorrect' is not valid." + "\n" +
 "Name should start with a letter and can also contain numbers, dashes and spaces.", "red");
 	});
+	it("Should pass the target url to the 'open' package", async () => {
+		const openSpy = jasmine.createSpy("open").and.returnValue(Promise.resolve());
+		const moduleLoader = require("module");
+		const originalLoad = moduleLoader._load;
+		spyOn(moduleLoader, "_load").and.callFake(function (request: string, ...args: unknown[]) {
+			if (request === "open") {
+				return { __esModule: true, default: openSpy };
+			}
+			return originalLoad.call(this, request, ...args);
+		});
+		await doc.open("https://www.infragistics.com/search?q=igGrid");
+		expect(openSpy).toHaveBeenCalledTimes(1);
+		expect(openSpy).toHaveBeenCalledWith("https://www.infragistics.com/search?q=igGrid");
+	});
 });
diff --git a/spec/unit/igx-templates/calendar-spec.ts b/spec/unit/igx-templates/calendar-spec.ts
new file mode 100644
index 0000000000..2a36e5cf7b
--- /dev/null
+++ b/spec/unit/igx-templates/calendar-spec.ts
@@ -0,0 +1,53 @@
+import { App, ControlExtraConfigType, Template } from "@igniteui/cli-core";
+import * as path from "path";
+import { requireFresh } from "../../helpers/utils";
+
+const templatePath = path.join(__dirname, "../../../packages/igx-templates/igx-ts/calendar/default");
+
+describe("Unit - igx-ts Calendar template", () => {
+	let template: Template;
+
+	beforeAll(() => {
+		App.initialize();
+	});
+
+	beforeEach(() => {
+		template = requireFresh<Template>(templatePath);
+	});
+
+	it("offers the selection type as a single choice extra configuration", () => {
+		const [extraConfig] = template.getExtraConfiguration();
+
+		expect(template.hasExtraConfiguration).toBeTrue();
+		expect(extraConfig.key).toBe("selectionType");
+		expect(extraConfig.type).toBe(ControlExtraConfigType.Choice);
+		expect(extraConfig.choices).toEqual(["Single selection", "Multi selection", "Range selection"]);
+		expect(extraConfig.default).toBe("Single selection");
+	});
+
+	it("generates empty selection variables when no selection type is set", () => {
+		const config = template.generateConfig("my calendar");
+
+		expect(config).toEqual(jasmine.objectContaining({
+			name: "my calendar",
+			ClassName: "MyCalendar",
+			selectionMode: "",
+			selectionType: ""
+		}));
+	});
+
+	for (const [selectionMode, selectionType] of [
+		["Single selection", ""],
+		["Multi selection", `selection="multi"`],
+		["Range selection", `selection="range"`]
+	]) {
+		it(`sets the selection attribute for '${selectionMode}'`, () => {
+			template.setExtraConfiguration({ selectionType: selectionMode });
+
+			const config = template.generateConfig("my calendar");
+
+			expect(config.selectionMode).toBe(selectionMode);
+			expect(config.selectionType).toBe(selectionType);
+		});
+	}
+});
diff --git a/spec/unit/igx-templates/grid-custom-spec.ts b/spec/unit/igx-templates/grid-custom-spec.ts
new file mode 100644
index 0000000000..d84c4fe740
--- /dev/null
+++ b/spec/unit/igx-templates/grid-custom-spec.ts
@@ -0,0 +1,150 @@
+import { App, ControlExtraConfigType, Template } from "@igniteui/cli-core";
+import * as path from "path";
+import { requireFresh } from "../../helpers/utils";
+
+const templatePath = path.join(__dirname, "../../../packages/igx-templates/igx-ts/grid/grid-custom");
+const featureUrl = "https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/";
+
+describe("Unit - igx-ts Custom Grid template", () => {
+	let template: Template;
+
+	beforeAll(() => {
+		App.initialize();
+	});
+
+	beforeEach(() => {
+		// the template module exports a singleton that keeps state between calls
+		template = requireFresh<Template>(templatePath);
+	});
+
+	function generate(columnFeatures?: string[]): { [key: string]: any } {
+		if (columnFeatures) {
+			template.setExtraConfiguration({ columnFeatures });
+		}
+		return template.generateConfig("my grid");
+	}
+
+	it("offers grid features as a multi choice extra configuration", () => {
+		const [extraConfig] = template.getExtraConfiguration();
+
+		expect(template.hasExtraConfiguration).toBeTrue();
+		expect(extraConfig.key).toBe("columnFeatures");
+		expect(extraConfig.type).toBe(ControlExtraConfigType.MultiChoice);
+		expect(extraConfig.choices).toEqual(["Sorting", "Filtering", "Cell Editing", "Row Editing", "Group By",
+			"Resizing", "Row Selection", "Paging", "Column Pinning", "Column Moving", "Column Hiding"]);
+	});
+
+	it("generates empty feature variables when no features are selected", () => {
+		const baseDependencies = [...template.dependencies];
+		const config = generate();
+
+		expect(config).toEqual(jasmine.objectContaining({
+			name: "my grid",
+			ClassName: "MyGrid",
+			additionalMarkup: "",
+			checkBoxBind: `[checked]="cell.value" [disabled]="true"`,
+			columnPinning: "",
+			datePickerEditor: "",
+			groupByColumn: "",
+			selectedFeatures: "",
+			columnBoolFeatures: "",
+			columnFeatures: "",
+			gridFeatures: ""
+		}));
+		expect(template.dependencies).toEqual(baseDependencies);
+	});
+
+	it("adds column features for sorting, filtering and resizing", () => {
+		const config = generate(["Sorting", "Filtering", "Resizing"]);
+
+		expect(config.columnFeatures).toBe(`[sortable]="true" [filterable]="true" [resizable]="true"`);
+		expect(config.columnBoolFeatures).toBe(config.columnFeatures);
+		expect(config.gridFeatures).toBe(`[allowFiltering]="true"`);
+	});
+
+	it("does not enable grid filtering for sorting", () => {
+		const config = generate(["Sorting"]);
+
+		expect(config.columnFeatures).toBe(`[sortable]="true"`);
+		expect(config.gridFeatures).toBe("");
+	});
+
+	it("enables grid filtering for filtering", () => {
+		const config = generate(["Sorting", "Filtering"]);
+
+		expect(config.columnFeatures).toBe(`[sortable]="true" [filterable]="true"`);
+		expect(config.gridFeatures).toBe(`[allowFiltering]="true"`);
+	});
+
+	it("makes columns editable and binds checkboxes for cell editing", () => {
+		const config = generate(["Cell Editing"]);
+
+		expect(config.columnFeatures).toBe(`[editable]="true"`);
+		expect(config.columnBoolFeatures).toBe("");
+		expect(config.checkBoxBind).toBe(`[ngModel]="cell.value" (ngModelChange)="cell.update($event)"`);
+		expect(template.dependencies).toContain(
+			jasmine.objectContaining({ import: "FormsModule", from: "@angular/forms" }));
+	});
+
+	it("adds grid features for row editing, row selection and column moving", () => {
+		const config = generate(["Row Editing", "Row Selection", "Column Moving"]);
+
+		expect(config.gridFeatures).toBe(`[rowEditable]="true" rowSelection="multiple" [moving]="true"`);
+		expect(template.dependencies).toContain(jasmine.objectContaining({ import: "IgxDatePickerComponent" }));
+	});
+
+	it("adds a paginator for paging", () => {
+		const config = generate(["Paging"]);
+
+		expect(config.additionalMarkup).toBe("\n  <igx-paginator></igx-paginator>");
+		expect(template.dependencies).toContain(jasmine.objectContaining({ import: "IgxPaginatorComponent" }));
+	});
+
+	it("marks columns as groupable for group by", () => {
+		const config = generate(["Group By"]);
+
+		expect(config.groupByColumn).toBe(`[groupable]="true"`);
+	});
+
+	it("adds a toolbar with pinning and hiding actions before the paginator", () => {
+		const config = generate(["Column Pinning", "Paging", "Column Hiding"]);
+
+		expect(config.columnPinning).toBe(`[pinned]="true"`);
+		expect(config.additionalMarkup).toBe([
+			"",
+			"  <igx-grid-toolbar>",
+			"    <igx-grid-toolbar-title>Employees</igx-grid-toolbar-title>",
+			"    <igx-grid-toolbar-actions>",
+			"      <igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>",
+			"      <igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>",
+			"    </igx-grid-toolbar-actions>",
+			"  </igx-grid-toolbar>",
+			"  <igx-paginator></igx-paginator>"
+		].join("\n"));
+		for (const toolbarImport of ["IgxGridToolbarComponent", "IgxGridToolbarTitleComponent",
+			"IgxGridToolbarActionsComponent", "IgxGridToolbarPinningComponent", "IgxGridToolbarHidingComponent"]) {
+			expect(template.dependencies).toContain(jasmine.objectContaining({ import: toolbarImport }));
+		}
+	});
+
+	it("links every selected feature to its documentation", () => {
+		const features: [string, string][] = [
+			["Sorting", "sorting"],
+			["Filtering", "filtering"],
+			["Cell Editing", "editing"],
+			["Row Editing", "row-editing"],
+			["Group By", "groupby"],
+			["Resizing", "column-resizing"],
+			["Row Selection", "selection"],
+			["Paging", "paging"],
+			["Column Pinning", "column-pinning"],
+			["Column Moving", "column-moving"],
+			["Column Hiding", "column-hiding"]
+		];
+
+		const config = generate(features.map(([feature]) => feature));
+
+		const links = features.map(([feature, page]) => ` <a href="${featureUrl}${page}" target="_blank">${feature}</a>`);
+		expect(config.selectedFeatures).toBe(`<p>Active Features: ${links.join(",")}</p>`);
+	});
+});
diff --git a/spec/unit/igx-templates/hierarchical-grid-custom-spec.ts b/spec/unit/igx-templates/hierarchical-grid-custom-spec.ts
new file mode 100644
index 0000000000..c95de39695
--- /dev/null
+++ b/spec/unit/igx-templates/hierarchical-grid-custom-spec.ts
@@ -0,0 +1,165 @@
+import { App, ControlExtraConfigType, Template } from "@igniteui/cli-core";
+import * as path from "path";
+import { requireFresh } from "../../helpers/utils";
+
+const templatePath = path.join(__dirname,
+	"../../../packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom");
+const featureUrl = "https://www.infragistics.com/products/ignite-ui-angular/angular/components/hierarchicalgrid/";
+
+describe("Unit - igx-ts Custom Hierarchical Grid template", () => {
+	let template: Template;
+
+	beforeAll(() => {
+		App.initialize();
+	});
+
+	beforeEach(() => {
+		// the template module exports a singleton that keeps state between calls
+		template = requireFresh<Template>(templatePath);
+	});
+
+	function generate(columnFeatures?: string[]): { [key: string]: any } {
+		if (columnFeatures) {
+			template.setExtraConfiguration({ columnFeatures });
+		}
+		return template.generateConfig("my hierarchical grid");
+	}
+
+	it("offers hierarchical grid features as a multi choice extra configuration", () => {
+		const [extraConfig] = template.getExtraConfiguration();
+
+		expect(template.hasExtraConfiguration).toBeTrue();
+		expect(extraConfig.key).toBe("columnFeatures");
+		expect(extraConfig.type).toBe(ControlExtraConfigType.MultiChoice);
+		expect(extraConfig.choices).toEqual(["Sorting", "Filtering", "Cell Editing", "Resizing", "Row Selection",
+			"Paging", "Column Pinning", "Column Moving", "Column Hiding"]);
+	});
+
+	it("generates empty feature variables when no features are selected", () => {
+		const baseDependencies = [...template.dependencies];
+		const config = generate();
+
+		expect(config).toEqual(jasmine.objectContaining({
+			name: "my hierarchical grid",
+			ClassName: "MyHierarchicalGrid",
+			additionalMarkup: "",
+			selectedFeatures: "",
+			columnFeatures: "",
+			gridFeatures: "",
+			rowIslandFeatures: ""
+		}));
+		expect(config.albumPin).toBeUndefined();
+		expect(template.dependencies).toEqual(baseDependencies);
+	});
+
+	it("adds column features for sorting, filtering and resizing", () => {
+		const config = generate(["Sorting", "Filtering", "Resizing"]);
+
+		expect(config.columnFeatures).toBe(`[sortable]="true" [filterable]="true" [resizable]="true"`);
+		expect(config.gridFeatures).toBe("");
+	});
+
+	it("makes columns editable for cell editing", () => {
+		const config = generate(["Cell Editing"]);
+
+		expect(config.columnFeatures).toBe(`[editable]="true"`);
+		expect(template.dependencies).toContain(
+			jasmine.objectContaining({ import: "FormsModule", from: "@angular/forms" }));
+	});
+
+	it("applies grid features to both the grid and the row island", () => {
+		const config = generate(["Row Selection", "Column Moving"]);
+
+		expect(config.gridFeatures).toBe(`rowSelection="multiple" [moving]="true"`);
+		expect(config.rowIslandFeatures).toBe(config.gridFeatures);
+	});
+
+	it("adds a paginator for paging", () => {
+		const config = generate(["Paging"]);
+
+		expect(config.additionalMarkup).toBe(`\n  <igx-paginator [perPage]="5"></igx-paginator>`);
+		expect(template.dependencies).toContain(jasmine.objectContaining({ import: "IgxPaginatorComponent" }));
+	});
+
+	it("adds pin toggle header templates for column pinning", () => {
+		const config = generate(["Column Pinning"]);
+
+		for (const [key, column] of [["albumPin", "Album"], ["artistPin", "Artist"], ["awardsPin", "Awards"],
+			["grammyPin", "Grammy"], ["launchPin", "Launch"], ["nominationsPin", "Nominations"]]) {
+			expect(config[key]).toContain(`<span style="float:left">${column}</span>`);
+			expect(config[key]).toContain(`(click)="toggleColumn(columnRef, $event)"`);
+			expect(config[key]).not.toContain("\t");
+		}
+	});
+
+	it("adds a toolbar with a hiding action before the paginator", () => {
+		const config = generate(["Paging", "Column Hiding"]);
+
+		expect(config.additionalMarkup).toBe([
+			"",
+			"  <igx-grid-toolbar>",
+			"    <igx-grid-toolbar-title>Singers</igx-grid-toolbar-title>",
+			"    <igx-grid-toolbar-actions>",
+			"      <igx-grid-toolbar-hiding title='Column Hiding'></igx-grid-toolbar-hiding>",
+			"    </igx-grid-toolbar-actions>",
+			"  </igx-grid-toolbar>",
+			`  <igx-paginator [perPage]="5"></igx-paginator>`
+		].join("\n"));
+		for (const toolbarImport of ["IgxGridToolbarComponent", "IgxGridToolbarTitleComponent",
+			"IgxGridToolbarActionsComponent", "IgxGridToolbarPinningComponent", "IgxGridToolbarHidingComponent"]) {
+			expect(template.dependencies).toContain(jasmine.objectContaining({ import: toolbarImport }));
+		}
+	});
+
+	it("adds the toolbar once when other features follow column hiding", () => {
+		const config = generate(["Column Hiding", "Sorting", "Paging"]);
+
+		expect(config.additionalMarkup).toBe([
+			"",
+			"  <igx-grid-toolbar>",
+			"    <igx-grid-toolbar-title>Singers</igx-grid-toolbar-title>",
+			"    <igx-grid-toolbar-actions>",
+			"      <igx-grid-toolbar-hiding title='Column Hiding'></igx-grid-toolbar-hiding>",
+			"    </igx-grid-toolbar-actions>",
+			"  </igx-grid-toolbar>",
+			`  <igx-paginator [perPage]="5"></igx-paginator>`
+		].join("\n"));
+		const toolbarImports = template.dependencies
+			.filter(dep => (dep as { import?: string }).import === "IgxGridToolbarComponent");
+		expect(toolbarImports.length).toBe(1);
+	});
+
+	it("does not carry markup, pinning or dependencies over to the next generated grid", () => {
+		const imports = () => template.dependencies.map(dep => (dep as { import?: string | string[] }).import);
+		const baseImports = imports();
+		const first = generate(["Column Hiding", "Paging", "Column Pinning", "Cell Editing"]);
+		expect(first.additionalMarkup).toContain("<igx-grid-toolbar>");
+		expect(first.albumPin).toBeDefined();
+		expect(imports()).toContain("IgxPaginatorComponent");
+
+		const second = generate([]);
+
+		expect(second.additionalMarkup).toBe("");
+		expect(second.albumPin).toBeUndefined();
+		expect(imports()).toEqual(baseImports);
+	});
+
+	it("links every selected feature to its documentation", () => {
+		const features: [string, string][] = [
+			["Sorting", "sorting"],
+			["Filtering", "filtering"],
+			["Cell Editing", "editing"],
+			["Resizing", "column-resizing"],
+			["Row Selection", "selection"],
+			["Paging", "paging"],
+			["Column Pinning", "column-pinning"],
+			["Column Moving", "column-moving"],
+			["Column Hiding", "column-hiding"]
+		];
+
+		const config = generate(features.map(([feature]) => feature));
+
+		const links = features.map(([feature, page]) => ` <a href="${featureUrl}${page}" target="_blank">${feature}</a>`);
+		expect(config.selectedFeatures).toBe(`<p>Active Features: ${links.join(",")}</p>`);
+	});
+});
diff --git a/spec/unit/igx-templates/multi-column-headers-spec.ts b/spec/unit/igx-templates/multi-column-headers-spec.ts
new file mode 100644
index 0000000000..9c59c203f0
--- /dev/null
+++ b/spec/unit/igx-templates/multi-column-headers-spec.ts
@@ -0,0 +1,78 @@
+import { App, ControlExtraConfigType, Template } from "@igniteui/cli-core";
+import * as path from "path";
+import { requireFresh } from "../../helpers/utils";
+
+const templatePath = path.join(__dirname, "../../../packages/igx-templates/igx-ts/grid/multi-column-headers");
+
+describe("Unit - igx-ts Multi Column Headers template", () => {
+	let template: Template;
+
+	beforeAll(() => {
+		App.initialize();
+	});
+
+	beforeEach(() => {
+		template = requireFresh<Template>(templatePath);
+	});
+
+	function generate(columnFeatures?: string[]): { [key: string]: any } {
+		if (columnFeatures) {
+			template.setExtraConfiguration({ columnFeatures });
+		}
+		return template.generateConfig("my grid");
+	}
+
+	it("offers only features the template implements", () => {
+		const [extraConfig] = template.getExtraConfiguration();
+
+		expect(template.hasExtraConfiguration).toBeTrue();
+		expect(extraConfig.key).toBe("columnFeatures");
+		expect(extraConfig.type).toBe(ControlExtraConfigType.MultiChoice);
+		expect(extraConfig.choices).toEqual(["Sorting", "Filtering", "Resizing", "Paging", "Moving"]);
+	});
+
+	it("generates empty feature variables when no features are selected", () => {
+		const config = generate();
+
+		expect(config).toEqual(jasmine.objectContaining({
+			name: "my grid",
+			ClassName: "MyGrid",
+			additionalMarkup: "",
+			checkBoxBind: `[checked]="cell.value" [disabled]="true"`,
+			selectedFeatures: "",
+			columnBoolFeatures: "",
+			columnFeatures: "",
+			gridFeatures: ""
+		}));
+	});
+
+	it("adds column features for sorting, filtering and resizing", () => {
+		const config = generate(["Sorting", "Filtering", "Resizing"]);
+
+		expect(config.columnFeatures).toBe(`[sortable]="true" [filterable]="true" [resizable]="true"`);
+		expect(config.columnBoolFeatures).toBe(config.columnFeatures);
+		expect(config.selectedFeatures).toBe("Sorting, Filtering, Resizing");
+	});
+
+	it("enables column moving on the grid instead of the removed column 'movable' input", () => {
+		const config = generate(["Sorting", "Moving"]);
+
+		expect(config.columnFeatures).toBe(`[sortable]="true"`);
+		expect(config.columnFeatures).not.toContain("movable");
+		expect(config.gridFeatures).toBe(`[moving]="true"`);
+	});
+
+	it("adds a paginator for paging", () => {
+		const config = generate(["Paging"]);
+
+		expect(config.additionalMarkup).toBe("\n  <igx-paginator></igx-paginator>");
+		expect(config.selectedFeatures).toBe("Paging");
+	});
+
+	it("adds a grid feature for row selection", () => {
+		// "Row Selection" is not among the offered choices; this covers the template's unused case
+		const config = generate(["Row Selection"]);
+
+		expect(config.gridFeatures).toBe(`rowSelection="multiple"`);
+	});
+});
diff --git a/spec/unit/igx-templates/tree-grid-custom-spec.ts b/spec/unit/igx-templates/tree-grid-custom-spec.ts
new file mode 100644
index 0000000000..da6a0c51ba
--- /dev/null
+++ b/spec/unit/igx-templates/tree-grid-custom-spec.ts
@@ -0,0 +1,129 @@
+import { App, ControlExtraConfigType, Template } from "@igniteui/cli-core";
+import * as path from "path";
+import { requireFresh } from "../../helpers/utils";
+
+const templatePath = path.join(__dirname, "../../../packages/igx-templates/igx-ts/tree-grid/tree-grid-custom");
+const featureUrl = "https://www.infragistics.com/products/ignite-ui-angular/angular/components/treegrid/";
+
+describe("Unit - igx-ts Custom Tree Grid template", () => {
+	let template: Template;
+
+	beforeAll(() => {
+		App.initialize();
+	});
+
+	beforeEach(() => {
+		// the template module exports a singleton that keeps state between calls
+		template = requireFresh<Template>(templatePath);
+	});
+
+	function generate(columnFeatures?: string[]): { [key: string]: any } {
+		if (columnFeatures) {
+			template.setExtraConfiguration({ columnFeatures });
+		}
+		return template.generateConfig("my tree grid");
+	}
+
+	it("offers tree grid features as a multi choice extra configuration", () => {
+		const [extraConfig] = template.getExtraConfiguration();
+
+		expect(template.hasExtraConfiguration).toBeTrue();
+		expect(extraConfig.key).toBe("columnFeatures");
+		expect(extraConfig.type).toBe(ControlExtraConfigType.MultiChoice);
+		expect(extraConfig.choices).toEqual(["Sorting", "Filtering", "Cell Editing", "Row Editing", "Resizing",
+			"Row Selection", "Paging", "Column Pinning", "Column Moving", "Column Hiding"]);
+	});
+
+	it("includes the shared tree grid data files", () => {
+		expect(template.templatePaths).toEqual([
+			path.join(templatePath, "files"),
+			path.join(templatePath, "../../../shared-data/tree-grid/files")
+		]);
+	});
+
+	it("generates empty feature variables when no features are selected", () => {
+		const baseDependencies = [...template.dependencies];
+		const config = generate();
+
+		expect(config).toEqual(jasmine.objectContaining({
+			name: "my tree grid",
+			ClassName: "MyTreeGrid",
+			additionalMarkup: "",
+			columnPinning: "",
+			selectedFeatures: "",
+			columnBoolFeatures: "",
+			columnFeatures: "",
+			treeGridFeatures: ""
+		}));
+		expect(template.dependencies).toEqual(baseDependencies);
+	});
+
+	it("adds column features for sorting, filtering and resizing", () => {
+		const config = generate(["Sorting", "Filtering", "Resizing"]);
+
+		expect(config.columnFeatures).toBe(`[sortable]="true" [filterable]="true" [resizable]="true"`);
+		expect(config.columnBoolFeatures).toBe(config.columnFeatures);
+		expect(config.treeGridFeatures).toBe(`[allowFiltering]="true"`);
+	});
+
+	it("makes columns editable for cell editing", () => {
+		const config = generate(["Cell Editing"]);
+
+		expect(config.columnFeatures).toBe(`[editable]="true"`);
+		expect(config.columnBoolFeatures).toBe("");
+	});
+
+	it("adds tree grid features for row editing, row selection and column moving", () => {
+		const config = generate(["Row Editing", "Row Selection", "Column Moving"]);
+
+		expect(config.treeGridFeatures).toBe(`[rowEditable]="true" rowSelection="multiple" [moving]="true"`);
+	});
+
+	it("adds a paginator for paging", () => {
+		const config = generate(["Paging"]);
+
+		expect(config.additionalMarkup).toBe("\n  <igx-paginator></igx-paginator>");
+		expect(template.dependencies).toContain(jasmine.objectContaining({ import: "IgxPaginatorComponent" }));
+	});
+
+	it("adds a toolbar with pinning and hiding actions before the paginator", () => {
+		const config = generate(["Column Pinning", "Paging", "Column Hiding"]);
+
+		expect(config.columnPinning).toBe(`[pinned]="true"`);
+		expect(config.additionalMarkup).toBe([
+			"",
+			"  <igx-grid-toolbar>",
+			"    <igx-grid-toolbar-title>Employees</igx-grid-toolbar-title>",
+			"    <igx-grid-toolbar-actions>",
+			"      <igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>",
+			"      <igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>",
+			"    </igx-grid-toolbar-actions>",
+			"  </igx-grid-toolbar>",
+			"  <igx-paginator></igx-paginator>"
+		].join("\n"));
+		for (const toolbarImport of ["IgxGridToolbarComponent", "IgxGridToolbarTitleComponent",
+			"IgxGridToolbarActionsComponent", "IgxGridToolbarPinningComponent", "IgxGridToolbarHidingComponent"]) {
+			expect(template.dependencies).toContain(jasmine.objectContaining({ import: toolbarImport }));
+		}
+	});
+
+	it("links every selected feature to its documentation", () => {
+		const features: [string, string][] = [
+			["Sorting", "sorting"],
+			["Filtering", "filtering"],
+			["Cell Editing", "editing"],
+			["Row Editing", "row-editing"],
+			["Resizing", "column-resizing"],
+			["Row Selection", "selection"],
+			["Paging", "paging"],
+			["Column Pinning", "column-pinning"],
+			["Column Moving", "column-moving"],
+			["Column Hiding", "column-hiding"]
+		];
+
+		const config = generate(features.map(([feature]) => feature));
+
+		const links = features.map(([feature, page]) => ` <a href="${featureUrl}${page}" target="_blank">${feature}</a>`);
+		expect(config.selectedFeatures).toBe(`<p>Active Features:<br />${links.join(",")}</p>`);
+	});
+});
diff --git a/spec/unit/list-spec.ts b/spec/unit/list-spec.ts
index 30ac41865d..088c9152bf 100644
--- a/spec/unit/list-spec.ts
+++ b/spec/unit/list-spec.ts
@@ -203,4 +203,34 @@ describe("Unit - List command", () => {
 		expect(Util.log).toHaveBeenCalledWith("	id2.1     Description for 2.1");
 		expect(Util.log).toHaveBeenCalledWith("	id2.2     Description for 2.2");
 	});
+
+	it("Should list custom templates under the 'Views' group", async () => {
+		const framework = { name: "Angular" };
+		const projectLib = {
+			projectType: "igx-ts",
+			templates: [
+				{ controlGroup: "group1", id: "id1.1", description: "Description for 1.1" },
+				{ controlGroup: "group1", id: "view1", description: "Custom view 1", listInCustomTemplates: true },
+				{ controlGroup: "group2", id: "view2", description: "Custom view 2", listInCustomTemplates: true }
+			]
+		};
+
+		App.container.set(TEMPLATE_MANAGER, jasmine.createSpyObj("TemplateManager", {
+			getFrameworkById: framework,
+			getProjectLibrary: projectLib
+		}));
+
+		await listCmd.handler({ framework: "angular", type: "igx-ts", _: ["list"], $0: "list" });
+
+		expect(Util.error).toHaveBeenCalledTimes(0);
+
+		expect(Util.log).toHaveBeenCalledTimes(6);
+		expect(Util.log).toHaveBeenCalledWith("Available templates for 'Angular' framework 'igx-ts' type");
+		expect(Util.log).toHaveBeenCalledWith("'group1' group:");
+		expect(Util.log).toHaveBeenCalledWith("	id1.1     Description for 1.1");
+		expect(Util.log).toHaveBeenCalledWith("'Views' group:");
+		expect(Util.log).toHaveBeenCalledWith("	view1     Custom view 1");
+		expect(Util.log).toHaveBeenCalledWith("	view2     Custom view 2");
+		expect(Util.log).not.toHaveBeenCalledWith("'group2' group:");
+	});
 });
diff --git a/spec/unit/upgrade-spec.ts b/spec/unit/upgrade-spec.ts
index 4771fa0007..8e8a0c9ca6 100644
--- a/spec/unit/upgrade-spec.ts
+++ b/spec/unit/upgrade-spec.ts
@@ -132,6 +132,15 @@ describe("Unit - Upgrade command", () => {
 		await upgradeCmd.handler({ skipInstall: false, _: ["upgrade"], $0: "upgrade" });
 		expect(mockProjTemplate.upgradeIgniteUIPackages).toHaveBeenCalledTimes(3);
 		expect(Util.execSync).toHaveBeenCalledWith("npm install --quiet");
+
+		spyOn(Util, "error");
+		(Util.log as jasmine.Spy).calls.reset();
+		(Util.execSync as jasmine.Spy).and.throwError("npm install failed");
+		await upgradeCmd.handler({ skipInstall: false, _: ["upgrade"], $0: "upgrade" });
+		expect(mockProjTemplate.upgradeIgniteUIPackages).toHaveBeenCalledTimes(4);
+		expect(Util.error).toHaveBeenCalledWith("Error installing npm packages.");
+		expect(Util.log).toHaveBeenCalledWith("npm install failed");
+		expect(Util.log).not.toHaveBeenCalledWith("npm packages installed.");
 	});
 
 	it("Logs error for not supported framework", async () => {