diff --git a/easytls b/easytls
index 75bc4c9..064f71b 100755
--- a/easytls
+++ b/easytls
@@ -4048,6 +4048,11 @@ inline_tls_crypt_v2 ()
 # Inline TLS-Crypt-V2 Group Server Key with X509 Certificate
 inline_tls_crypt_v2_group_server ()
 {
+	print "Only Client keys require the Group setting."
+	print "Use your current standard Server key to build"
+	print "a new server inline file."
+	return 1
+
 	[ $# -ge 2 ] || \
 		die "Required option(s): <server_common_name> <server_group_key>"
 
@@ -4891,6 +4896,11 @@ build_tls_crypt_v2_client ()
 # Build group TLS-Crypt-v2 Server
 build_tls_cv2_group_server ()
 {
+	print "Only Client keys require the Group setting."
+	print "Use your current standard Server key to build"
+	print "new Client Group key(s) with."
+	return 1
+
 	[ $# -ge 1 ] || die "Required option(s): <server_group_name>"
 
 	# Verify OpenVPN version and use correct syntax to --genkey
diff --git a/easytls-unit-tests.sh b/easytls-unit-tests.sh
index e6e7807..179455e 100755
--- a/easytls-unit-tests.sh
+++ b/easytls-unit-tests.sh
@@ -212,7 +212,8 @@ for cmd in "init no-ca" "cf cg easytls-unit-test" \
 			"-r=s03 itcv2 c05" "-r=s03 -k=hw itcv2 c05 no-md" \
 			"-r=s03 itcv2 c06" "-r=s03 -k=hw itcv2 c06 add-hw" \
 			"-k=hw rmd c06 serial" "status" \
-			"bc2gs sg01" "bc2gc sg01 cg01" "bc2gc sg01 cg02 ${hwaddr1} ${hwaddr2} ${ip4addr} ${ip6addr}"
+			"bc2gc s03 cg01" "bc2gc s03 cg02 ${hwaddr1} ${hwaddr2} ${ip4addr} ${ip6addr}" \
+			"ic2gc c06 cg02"
 do
 	[ "${cmd}" = 99 ] && exit 99
 	echo "--------------------"
@@ -359,8 +360,8 @@ do
 		"--custom-group=tincantech --sub-key-name=eve remove-tlskey c10" \
 		"cert-expire" \
 		"inline-expire" \
-		"bc2gs sg01" "bc2gc sg01 cg01" "bc2gc sg01 cg02 ${hwaddr1} ${hwaddr2} ${ip4addr} ${ip6addr}" \
-		"ic2gs s01 sg01" "ic2gc c01 cg01" "ic2gc c01 cg02"
+		"bc2gc s01 cg01" "bc2gc s01 cg02 ${hwaddr1} ${hwaddr2} ${ip4addr} ${ip6addr}" \
+		"ic2gc c01 cg01" "ic2gc c01 cg02"
 		#"inline-index-rebuild" \
 		## EOL
 	do