diff --git a/program/rust/src/accounts.rs b/program/rust/src/accounts.rs
index f05e0685..8bc83ce5 100644
--- a/program/rust/src/accounts.rs
+++ b/program/rust/src/accounts.rs
@@ -43,6 +43,8 @@ mod product;
 #[cfg(feature = "strum")]
 pub use price::MessageType;
 #[cfg(test)]
+pub use price::PriceCumulative;
+#[cfg(test)]
 pub use product::{
     account_has_key_values,
     create_pc_str_t,
@@ -54,13 +56,11 @@ pub use {
         PriceAccount,
         PriceAccountFlags,
         PriceComponent,
-        PriceCumulative,
         PriceEma,
         PriceInfo,
         PythOracleSerialize,
     },
     product::{
-        read_pc_str_t,
         update_product_metadata,
         ProductAccount,
     },
diff --git a/program/rust/src/lib.rs b/program/rust/src/lib.rs
index e71b7c65..eb1881ef 100644
--- a/program/rust/src/lib.rs
+++ b/program/rust/src/lib.rs
@@ -37,11 +37,13 @@ pub use accounts::{
     MappingAccount,
     PermissionAccount,
     PriceAccount,
+    PriceAccountFlags,
     PriceComponent,
     PriceEma,
     PriceInfo,
     ProductAccount,
     PythAccount,
+    PythOracleSerialize,
 };
 use {
     crate::error::OracleError,
diff --git a/program/rust/src/processor.rs b/program/rust/src/processor.rs
index 7018a948..b4104fc1 100644
--- a/program/rust/src/processor.rs
+++ b/program/rust/src/processor.rs
@@ -27,14 +27,15 @@ mod upd_permissions;
 mod upd_price;
 mod upd_product;
 
+#[cfg(test)]
+pub use add_publisher::{
+    DISABLE_ACCUMULATOR_V2,
+    ENABLE_ACCUMULATOR_V2,
+};
 pub use {
     add_price::add_price,
     add_product::add_product,
-    add_publisher::{
-        add_publisher,
-        DISABLE_ACCUMULATOR_V2,
-        ENABLE_ACCUMULATOR_V2,
-    },
+    add_publisher::add_publisher,
     del_price::del_price,
     del_product::del_product,
     del_publisher::del_publisher,
diff --git a/program/rust/src/tests/test_upd_price_with_validator.rs b/program/rust/src/tests/test_upd_price_with_validator.rs
index f25db775..8334a40f 100644
--- a/program/rust/src/tests/test_upd_price_with_validator.rs
+++ b/program/rust/src/tests/test_upd_price_with_validator.rs
@@ -24,9 +24,7 @@ use {
             update_clock_slot,
             AccountSetup,
         },
-        validator::{
-            self,
-        },
+        validator,
     },
     solana_program::{
         program_error::ProgramError,