diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 824b24f..403603a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,8 +7,8 @@ on:
     branches: [main]
 
 env:
-  SBPF_PROGRAM_PACKAGES: "['program']"
-  RUST_PACKAGES: "['program', secp256k1-verify]"
+  SBPF_PROGRAM_PACKAGES: "['program', 'secp256k1-verify']"
+  RUST_PACKAGES: "['program', 'secp256k1-verify']"
 
 jobs:
   set_env:
@@ -41,4 +41,4 @@ jobs:
       rustfmt-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
       clippy-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
       solana-cli-version: ${{ needs.set_env.outputs.SOLANA_CLI_VERSION }}
-      generate-clilents: false
+      generate-clients: false
diff --git a/Makefile b/Makefile
index cffb4ff..7995763 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ SBF_ARCH = v2
 nightly = +${RUST_TOOLCHAIN_NIGHTLY}
 
 make-path = $(if $(filter program secp256k1,$1),program,$1)
-make-so = $(if $(filter program secp256k1,$1),solana_secp256k1_program,$1)
 
 rust-toolchain-nightly:
 	@echo ${RUST_TOOLCHAIN_NIGHTLY}
@@ -47,24 +46,10 @@ build-sbf-%:
 	cargo build-sbf --arch $(SBF_ARCH) --manifest-path $(call make-path,$*)/Cargo.toml -- --locked $(ARGS)
 
 test-%:
-	@if [ -f target/deploy/$(call make-so,$*).so ]; then \
-		SBF_OUT_DIR=$(PWD)/target/deploy cargo test \
-			--locked \
-			--manifest-path $(call make-path,$*)/Cargo.toml \
-			$(ARGS); \
-	else \
-		cargo test \
-			--locked \
-			--manifest-path $(call make-path,$*)/Cargo.toml \
-			$(ARGS); \
-	fi
-
-cu-secp256k1: build-sbf-secp256k1
 	SBF_OUT_DIR=$(PWD)/target/deploy cargo test \
 		--locked \
-		--manifest-path Cargo.toml \
-		--test mollusk \
-		-- --nocapture
+		--manifest-path $(call make-path,$*)/Cargo.toml \
+		$(ARGS)
 
-generate-clients:
-	exit 0
+cu-program: build-sbf-secp256k1
+	$(MAKE) test-program ARGS="--test verify -- --nocapture"