diff --git a/contracts/examples/ping-pong-egld/interactor/tests/interact_cs_test.rs b/contracts/examples/ping-pong-egld/interactor/tests/interact_cs_test.rs
index 9e0b4d735d..d689b57da5 100644
--- a/contracts/examples/ping-pong-egld/interactor/tests/interact_cs_test.rs
+++ b/contracts/examples/ping-pong-egld/interactor/tests/interact_cs_test.rs
@@ -3,10 +3,11 @@ use ping_pong_egld_interact::{Config, PingPongEgldInteract};
 
 #[tokio::test]
 #[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
-async fn test_ping_unmatched_amount() {
+async fn test_ping_pong_egld() {
     let mut interact = PingPongEgldInteract::init(Config::chain_simulator_config()).await;
-
     let ping_amount = 1u64;
+
+    // test_ping_unmatched_amount
     let duration_in_seconds = 5u64;
     let opt_activation_timestamp = 2u64;
     let max_funds = 100_000u64;
@@ -23,14 +24,8 @@ async fn test_ping_unmatched_amount() {
     interact
         .ping(0u64, Some("the payment must match the fixed sum"), None)
         .await;
-}
-
-#[tokio::test]
-#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
-async fn test_ping_inactive_contracts() {
-    let mut interact = PingPongEgldInteract::init(Config::chain_simulator_config()).await;
 
-    let ping_amount = 1u64;
+    // test_ping_inactive_contracts
     let duration_in_seconds = 5u64;
     let opt_activation_timestamp = 2_000_000_000u64;
     let max_funds = 100_000u64;
@@ -47,14 +42,8 @@ async fn test_ping_inactive_contracts() {
     interact
         .ping(1u64, Some("smart contract not active yet"), None)
         .await;
-}
 
-#[tokio::test]
-#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
-async fn test_ping_passed_deadline() {
-    let mut interact = PingPongEgldInteract::init(Config::chain_simulator_config()).await;
-
-    let ping_amount = 1u64;
+    // test_ping_passed_deadline
     let duration_in_seconds = 5u64;
     let opt_activation_timestamp = 2u64;
     let max_funds = 100_000u64;
@@ -69,15 +58,10 @@ async fn test_ping_passed_deadline() {
         .await;
 
     interact.ping(1u64, Some("deadline has passed"), None).await;
-}
-
-#[tokio::test]
-#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
-async fn test_ping_max_funds() {
-    let mut interact = PingPongEgldInteract::init(Config::chain_simulator_config()).await;
 
+    // test_ping_max_funds
     let ping_amount = 10u64;
-    let duration_in_seconds = 30u64;
+    let duration_in_seconds = 30000u64;
     let max_funds = 10u64;
 
     interact
@@ -92,13 +76,8 @@ async fn test_ping_max_funds() {
     interact
         .ping(10u64, Some("smart contract full"), None)
         .await;
-}
-
-#[tokio::test]
-#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
-async fn test_ping() {
-    let mut interact = PingPongEgldInteract::init(Config::chain_simulator_config()).await;
 
+    // test ping
     let ping_amount = 1u64;
     let duration_in_seconds = 20u64;
     let max_funds = 100_000u64;
@@ -122,13 +101,8 @@ async fn test_ping() {
         .await;
 
     interact.pong(None, None).await;
-}
-
-#[tokio::test]
-#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
-async fn test_pong_all() {
-    let mut interact = PingPongEgldInteract::init(Config::chain_simulator_config()).await;
 
+    // test_pong_all
     let ping_amount = 1u64;
     let duration_in_seconds = 18u64;
     let max_funds = 100_000u64;