diff --git a/crates/pop-cli/src/commands/new/parachain.rs b/crates/pop-cli/src/commands/new/parachain.rs
index 737b0808..62998e9e 100644
--- a/crates/pop-cli/src/commands/new/parachain.rs
+++ b/crates/pop-cli/src/commands/new/parachain.rs
@@ -1,28 +1,35 @@
 // SPDX-License-Identifier: GPL-3.0
 use crate::style::{style, Theme};
 use anyhow::Result;
-use clap::Args;
+use clap::{
+	builder::{PossibleValue, PossibleValuesParser, TypedValueParser},
+	Args,
+};
 use std::{
 	fs,
 	path::{Path, PathBuf},
+	str::FromStr,
 };
 
 use cliclack::{clear_screen, confirm, input, intro, log, outro, outro_cancel, set_theme};
 use pop_parachains::{instantiate_template_dir, Config, Git, GitHub, Provider, Release, Template};
+use strum::VariantArray;
 
 #[derive(Args)]
 pub struct NewParachainCommand {
 	#[arg(help = "Name of the project. If empty assistance in the process will be provided.")]
 	pub(crate) name: Option<String>,
 	#[arg(
-		help = "Template provider. Options are pop or parity (deprecated).",
-		default_value = "pop"
+		help = "Template provider.",
+		default_value = Provider::Pop.as_ref(),
+		value_parser = crate::enum_variants!(Provider)
 	)]
 	pub(crate) provider: Option<Provider>,
 	#[arg(
 		short = 't',
 		long,
-		help = "Template to use: 'base' for Pop and 'cpt' and 'fpt' for Parity templates"
+		help = "Template to use.",
+		value_parser = crate::enum_variants!(Template)
 	)]
 	pub(crate) template: Option<Template>,
 	#[arg(long, short, help = "Token Symbol", default_value = "UNIT")]
@@ -44,6 +51,21 @@ pub struct NewParachainCommand {
 	pub(crate) path: Option<PathBuf>,
 }
 
+#[macro_export]
+macro_rules! enum_variants {
+	($e: ty) => {{
+		PossibleValuesParser::new(
+			<$e>::VARIANTS
+				.iter()
+				.map(|p| PossibleValue::new(p.as_ref()))
+				.collect::<Vec<_>>(),
+		)
+		.try_map(|s| {
+			<$e>::from_str(&s).map_err(|e| format!("could not convert from {s} to provider"))
+		})
+	}};
+}
+
 impl NewParachainCommand {
 	pub(crate) async fn execute(&self) -> Result<()> {
 		clear_screen()?;
@@ -268,15 +290,44 @@ fn prompt_customizable_options() -> Result<Config> {
 #[cfg(test)]
 mod tests {
 
+	use super::*;
+	use crate::{
+		commands::new::{NewArgs, NewCommands::Parachain},
+		Cli,
+		Commands::New,
+	};
+	use clap::Parser;
 	use git2::Repository;
+	use tempfile::tempdir;
 
-	use super::*;
-	use std::{fs, path::Path};
+	#[tokio::test]
+	async fn test_new_parachain_command_with_defaults_executes() -> Result<()> {
+		let dir = tempdir()?;
+		let cli = Cli::parse_from([
+			"pop",
+			"new",
+			"parachain",
+			dir.path().join("test_parachain").to_str().unwrap(),
+		]);
+
+		let New(NewArgs { command: Parachain(command) }) = cli.command else {
+			panic!("unable to parse command")
+		};
+		// Execute
+		let name = command.name.as_ref().unwrap();
+		command.execute().await?;
+		// check for git_init
+		let repo = Repository::open(Path::new(name))?;
+		let reflog = repo.reflog("HEAD")?;
+		assert_eq!(reflog.len(), 1);
+		Ok(())
+	}
 
 	#[tokio::test]
-	async fn test_new_parachain_command_execute() -> anyhow::Result<()> {
+	async fn test_new_parachain_command_execute() -> Result<()> {
+		let dir = tempdir()?;
 		let command = NewParachainCommand {
-			name: Some("test_parachain".to_string()),
+			name: Some(dir.path().join("test_parachain").to_str().unwrap().to_string()),
 			provider: Some(Provider::Pop),
 			template: Some(Template::Base),
 			symbol: Some("UNIT".to_string()),
@@ -284,18 +335,13 @@ mod tests {
 			initial_endowment: Some("1u64 << 60".to_string()),
 			path: None,
 		};
-		let result = command.execute().await;
-		assert!(result.is_ok());
+		command.execute().await?;
 
 		// check for git_init
 		let repo = Repository::open(Path::new(&command.name.unwrap()))?;
 		let reflog = repo.reflog("HEAD")?;
 		assert_eq!(reflog.len(), 1);
 
-		// Clean up
-		if let Err(err) = fs::remove_dir_all("test_parachain") {
-			eprintln!("Failed to delete directory: {}", err);
-		}
 		Ok(())
 	}
 
diff --git a/crates/pop-cli/src/main.rs b/crates/pop-cli/src/main.rs
index af707305..874ae60b 100644
--- a/crates/pop-cli/src/main.rs
+++ b/crates/pop-cli/src/main.rs
@@ -82,3 +82,10 @@ fn cache() -> Result<PathBuf> {
 	create_dir_all(cache_path.as_path())?;
 	Ok(cache_path)
 }
+
+#[test]
+fn verify_cli() {
+	// https://docs.rs/clap/latest/clap/_derive/_tutorial/chapter_4/index.html
+	use clap::CommandFactory;
+	Cli::command().debug_assert()
+}
diff --git a/crates/pop-parachains/src/templates.rs b/crates/pop-parachains/src/templates.rs
index 5c73486e..53e0a509 100644
--- a/crates/pop-parachains/src/templates.rs
+++ b/crates/pop-parachains/src/templates.rs
@@ -2,20 +2,24 @@
 use strum::{
 	EnumMessage as EnumMessageT, EnumProperty as EnumPropertyT, VariantArray as VariantArrayT,
 };
-use strum_macros::{Display, EnumMessage, EnumProperty, EnumString, VariantArray};
+use strum_macros::{AsRefStr, Display, EnumMessage, EnumProperty, EnumString, VariantArray};
 use thiserror::Error;
 
-#[derive(Clone, Default, Debug, Display, EnumMessage, EnumString, Eq, PartialEq, VariantArray)]
+#[derive(
+	AsRefStr, Clone, Default, Debug, Display, EnumMessage, EnumString, Eq, PartialEq, VariantArray,
+)]
 pub enum Provider {
 	#[default]
 	#[strum(
 		ascii_case_insensitive,
+		serialize = "pop",
 		message = "Pop",
 		detailed_message = "An all-in-one tool for Polkadot development."
 	)]
 	Pop,
 	#[strum(
 		ascii_case_insensitive,
+		serialize = "parity",
 		message = "Parity",
 		detailed_message = "Solutions for a trust-free world."
 	)]
@@ -58,6 +62,7 @@ pub struct Config {
 }
 
 #[derive(
+	AsRefStr,
 	Clone,
 	Debug,
 	Default,
@@ -111,7 +116,8 @@ impl Template {
 	}
 
 	pub fn matches(&self, provider: &Provider) -> bool {
-		self.get_str("Provider") == Some(provider.to_string().as_str())
+		// Match explicitly on provider name (message)
+		self.get_str("Provider") == Some(provider.name())
 	}
 
 	pub fn repository_url(&self) -> Result<&str, Error> {