@@ -4,7 +4,7 @@
 	RootModule = 'PSModuleDevelopment.psm1'
 
 	# Version number of this module.
-	ModuleVersion = '2.2.5.27'
+	ModuleVersion = '2.2.5.28'
 
 	# ID used to uniquely identify this module
 	GUID = '37dd5fce-e7b5-4d57-ac37-832055ce49d6'
 
@@ -1,5 +1,5 @@
 $script:PSModuleRoot = $PSScriptRoot
-$script:PSModuleVersion = "2.2.5.27"
+$script:PSModuleVersion = "2.2.5.28"
 
 $script:doDotSource = $false
 if (Get-PSFConfigValue -FullName PSModuleDevelopment.Import.DoDotSource) { $script:doDotSource = $true }
 
@@ -1,4 +1,7 @@
 # Changelog
+## 2.2.5.28 (September 08th, 2018)
+ - Fix: Template CommandTest would throw an exception due to missing quotes on a string index
+
 ## 2.2.5.27 (September 08th, 2018)
  - Fix: Fixes in the build task
 
 
@@ -13,11 +13,11 @@
 
 þ{
 			$lines = @()
-			$commonParameters = 'Verbose', 'Debug', 'ErrorAction', 'WarningAction', 'InformationAction', 'ErrorVariable', 'WarningVariable', 'InformationVariable', 'OutVariable', 'OutBuffer', 'PipelineVariable'
+			$commonParameters = 'Verbose', 'Debug', 'ErrorAction', 'WarningAction', 'InformationAction', 'ErrorVariable', 'WarningVariable', 'InformationVariable', 'OutVariable', 'OutBuffer', 'PipelineVariable', 'Confirm', 'WhatIf'
 			foreach ($parameter in ((Get-Command $Parameters.Name).Parameters.Values | Where-Object Name -NotIn $commonParameters))
 			{
 				$lines += "		It 'Should habe the expected parameter $($parameter.Name)' {"
-				$lines += "			`$parameter = (Get-Command $($Parameters.Name)).Parameters[$($parameter.Name)]"
+				$lines += "			`$parameter = (Get-Command $($Parameters.Name)).Parameters['$($parameter.Name)']"
 				$lines += "			`$parameter.Name | Should -Be '$($parameter.Name)'"
 				$lines += "			`$parameter.ParameterType.ToString() | Should -Be $($parameter.ParameterType.ToString())"
 				$lines += "			`$parameter.IsDynamic | Should -Be `$$($parameter.IsDynamic)"
@@ -38,7 +38,7 @@
 	}
 
 þ{
-		$commonParameters = 'Verbose', 'Debug', 'ErrorAction', 'WarningAction', 'InformationAction', 'ErrorVariable', 'WarningVariable', 'InformationVariable', 'OutVariable', 'OutBuffer', 'PipelineVariable'
+		$commonParameters = 'Verbose', 'Debug', 'ErrorAction', 'WarningAction', 'InformationAction', 'ErrorVariable', 'WarningVariable', 'InformationVariable', 'OutVariable', 'OutBuffer', 'PipelineVariable', 'Confirm', 'WhatIf'
 		foreach ($parameterSet in (Get-Command $Parameters.Name).ParameterSets)
 		{
 			$name = $parameterSet.Name