diff --git a/.gitmodules b/.gitmodules
index 7f2078f9e..c491e2040 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,9 @@
 [submodule "substrate-fixtures"]
 	path = substrate-fixtures
 	url = https://github.com/webb-tools/substrate-fixtures
+	branch = main
 
 [submodule "solidity-fixtures"]
 	path = solidity-fixtures
 	url = https://github.com/webb-tools/solidity-fixtures
-
+	branch = main
diff --git a/solidity-fixtures b/solidity-fixtures
index 56f98c388..a27da611e 160000
--- a/solidity-fixtures
+++ b/solidity-fixtures
@@ -1 +1 @@
-Subproject commit 56f98c38805d02e5e60851d27f9e804d5ba0d757
+Subproject commit a27da611e169de3fa7f08a71405ad55911edcea9
diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs
index 96523482f..04432454a 100644
--- a/standalone/node/src/chain_spec.rs
+++ b/standalone/node/src/chain_spec.rs
@@ -2,7 +2,7 @@ use arkworks_setups::{common::setup_params, Curve};
 use webb_primitives::{types::runtime::BabeId, AccountId, Balance, Signature};
 
 use itertools::Itertools;
-use sc_chain_spec::ChainSpecExtension;
+use sc_chain_spec::{ChainSpecExtension, Properties};
 use sc_service::ChainType;
 use serde::{Deserialize, Serialize};
 use sp_core::{sr25519, Pair, Public};
@@ -84,11 +84,15 @@ fn webb_session_keys(
 	webb_runtime::SessionKeys { grandpa, babe, im_online, authority_discovery }
 }
 
-pub fn webb_development_config() -> Result<ChainSpec, String> {
-	let mut properties = sc_chain_spec::Properties::new();
+fn properties() -> Properties {
+	let mut properties = Properties::new();
 	properties.insert("tokenSymbol".into(), "Unit".into());
 	properties.insert("tokenDecimals".into(), 18u32.into());
 	properties.insert("ss58Format".into(), 42.into());
+	properties
+}
+
+pub fn webb_development_config() -> Result<ChainSpec, String> {
 	Ok(ChainSpec::from_genesis(
 		// Name
 		"Development",
@@ -130,7 +134,7 @@ pub fn webb_development_config() -> Result<ChainSpec, String> {
 		// Fork ID
 		None,
 		// Properties
-		Some(properties),
+		Some(properties()),
 		Default::default(),
 	))
 }
@@ -177,7 +181,7 @@ pub fn webb_local_testnet_config() -> Result<ChainSpec, String> {
 		// Fork ID
 		None,
 		// Properties
-		None,
+		Some(properties()),
 		// Extensions
 		Default::default(),
 	))