diff --git a/components/eamxx/src/physics/mam/eamxx_mam_aci_process_interface.cpp b/components/eamxx/src/physics/mam/eamxx_mam_aci_process_interface.cpp
index 2916ee73725..52da3ed0498 100644
--- a/components/eamxx/src/physics/mam/eamxx_mam_aci_process_interface.cpp
+++ b/components/eamxx/src/physics/mam/eamxx_mam_aci_process_interface.cpp
@@ -1,5 +1,4 @@
 #include <physics/mam/eamxx_mam_aci_process_interface.hpp>
-#include <iomanip>
 
 /*
 -----------------------------------------------------------------
@@ -22,222 +21,6 @@ namespace scream {
 
 namespace {
 
-void print_output(const Real w0, const Real rho, const Real tke,
-                  const Real wsub, const Real wice, const Real wsig,
-                  const Real naai_hom, const Real naai, const Real rpdel,
-                  MAMAci::view_3d factnum, const Real tendnd,
-                  MAMAci::view_2d ptend_q[mam4::aero_model::pcnst],
-                  MAMAci::view_2d qqcw_fld_work[mam4::ndrop::ncnst_tot],
-                  const Real hetfrz_immersion_nucleation_tend,
-                  const Real hetfrz_contact_nucleation_tend,
-                  const Real hetfrz_depostion_nucleation_tend,
-                  const mam_coupling::AerosolState &dry_aero, const int kb) {
-
-  std::cout << "w0:" << std::setprecision (15) <<  w0 << std::endl;
-  std::cout << "rho: " << rho << std::endl;
-  std::cout << "TKE:" << tke << std::endl;
-  std::cout << "wsub:" << wsub << std::endl;
-  std::cout << "wsubi:" << wice << std::endl;
-  std::cout << "wsig:" << wsig << std::endl;
-  std::cout << "dgnum_ait:"<< std::endl;
-  std::cout << "naai_:" << naai << std::endl;
-  std::cout << "naai_hom:" << naai_hom << std::endl;
-  //std::cout << "rpdel_:" << rpdel << std::endl;
-  std::cout << "factnum:" << factnum(0, 0, kb) << "    " << factnum(0, 1, kb)
-            << " : " << factnum(0, 2, kb) << " : " << factnum(0, 3, kb)
-            << std::endl;
-  std::cout << "nctend_mixnuc:" << tendnd << std::endl;
-
-  for(int m = 0; m < mam_coupling::num_aero_modes(); ++m) {
-    std::cout << "inter_num:" << dry_aero.int_aero_nmr[m](0, kb) << std::endl;
-    for(int a = 0; a < mam_coupling::num_aero_species(); ++a) {
-      if(dry_aero.int_aero_mmr[m][a].data()) {
-        std::cout << "inter-mmr:" << dry_aero.int_aero_mmr[m][a](0, kb)
-                  << std::endl;
-      }
-    }
-  }
-  
-  for(int ic = 9; ic < 40; ++ic) {
-    std::cout << "ptend_q_:" << ic << ": " << ptend_q[ic](0, kb) << std::endl;
-  }
-  /*for(int ic = 0; ic < 25; ++ic) {
-    std::cout << "qqcw_:" << ic << ": " << qqcw_fld_work[ic](0, kb)
-              << std::endl;
-  }*/
-  for(int m = 0; m < mam_coupling::num_aero_modes(); ++m) {
-    std::cout << "cldbrn_num:" << dry_aero.cld_aero_nmr[m](0, kb) << std::endl;
-    for(int a = 0; a < mam_coupling::num_aero_species(); ++a) {
-      if(dry_aero.cld_aero_mmr[m][a].data()) {
-        std::cout << "cldbrn-mmr:" << dry_aero.cld_aero_mmr[m][a](0, kb)
-                  << std::endl;
-      }
-    }
-  }
-
-
-  /*for(int m = 0; m < mam_coupling::num_aero_modes(); ++m) {
-    std::cout << "cld_num:" << dry_aero.cld_aero_nmr[m](0, kb) << std::endl;
-    for(int a = 0; a < mam_coupling::num_aero_species(); ++a) {
-      if(dry_aero.cld_aero_mmr[m][a].data()) {
-        std::cout << "cld-mmr:" << dry_aero.cld_aero_mmr[m][a](0, kb)
-                  << std::endl;
-      }
-    }
-  }*/
-
-  std::cout << "hetfrz_immersion_nucleation_tend_:"
-            << hetfrz_immersion_nucleation_tend << ":"
-            << hetfrz_immersion_nucleation_tend << std::endl;
-  std::cout << "hetfrz_contact_nucleation_tend_:"
-            << hetfrz_contact_nucleation_tend << std::endl;
-  std::cout << "hetfrz_depostion_nucleation_tend_:"
-            << hetfrz_depostion_nucleation_tend << std::endl;
-}
-
-void set_input(MAMAci::view_2d w_sec_int_, MAMAci::view_2d kvh_int_,
-               const int ncol_, const int nlev_) {
-  const Real w_sec_e3sm[73] = {
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.40000000000000002E-003,
-      0.40000000000000002E-003, 0.44201892319518146E-003,
-      0.77315620137962326E-003, 0.24806301482800117E-002,
-      0.11109772692898754E-001, 0.40651094032490273E-001,
-      0.82156694426095800E-001, 0.12207124453993526E+000,
-      0.15516728994634110E+000, 0.17775318086169636E+000,
-      0.18549817250146838E+000, 0.17184548286554119E+000,
-      0.12741230682196053E+000, 0.65495229516041628E-001,
-      0.26909155217660592E-001};
-
-  for(int icol = 0; icol < ncol_; ++icol) {
-    for(int kk = 0; kk < nlev_; ++kk) {
-      w_sec_int_(icol, kk) = w_sec_e3sm[kk];
-      // w_sec_int_(icol, kk) = w_sec_mid_(icol, kk);
-    }
-    // w_sec_int_(icol, nlev_ + 1) = w_sec_mid_(icol, nlev_);
-    w_sec_int_(icol, nlev_ + 1) = w_sec_e3sm[nlev_ + 1];
-  }
-  const Real kvh_e3sm[73] = {0.25020913575496480E-002, 0.25021052914616470E-002,
-                             0.75991761081225006E-002, 0.12291092068185365E-001,
-                             0.11484807652762415E-001, 0.10856880396302943E-001,
-                             0.10500384508819637E-001, 0.10361486171738229E-001,
-                             0.10333325067964508E-001, 0.10258838031435397E-001,
-                             0.10027325248446619E-001, 0.97784259072973521E-002,
-                             0.96611845055866539E-002, 0.96249746122327937E-002,
-                             0.95773431515696512E-002, 0.95180614513688099E-002,
-                             0.94713233348487150E-002, 0.94503864489758338E-002,
-                             0.94536294366578833E-002, 0.94575972194308883E-002,
-                             0.94403767489615684E-002, 0.93975694769176284E-002,
-                             0.93322843554751022E-002, 0.92777070192527501E-002,
-                             0.92456776697171228E-002, 0.92266924824142716E-002,
-                             0.92123025773060436E-002, 0.91888715633294191E-002,
-                             0.91516797753615851E-002, 0.90958299606649744E-002,
-                             0.89988037524983237E-002, 0.88220984587642423E-002,
-                             0.85231270833157156E-002, 0.81397522619395188E-002,
-                             0.79160421807845088E-002, 0.81206851117902653E-002,
-                             0.86526891616674779E-002, 0.91682975412125615E-002,
-                             0.96043394254592580E-002, 0.10033689085881327E-001,
-                             0.10428656694074272E-001, 0.10715913043864789E-001,
-                             0.10919631245454951E-001, 0.11250937075285789E-001,
-                             0.11829292157343831E-001, 0.12413311776454055E-001,
-                             0.12851317662157077E-001, 0.13175523677700330E-001,
-                             0.13224182907540188E-001, 0.13085937680733115E-001,
-                             0.12615055546741534E-001, 0.11995423733019836E-001,
-                             0.12346556881757400E-001, 0.13433752971524651E-001,
-                             0.13904308240950175E-001, 0.13539811748121957E-001,
-                             0.12555099320041433E-001, 0.11519643673351362E-001,
-                             0.11414071302852231E-001, 0.13409756835238139E-001,
-                             0.24071962815959351E-001, 0.75489419450816414E-001,
-                             0.62082011878960308E+000, 0.63952862312816796E+001,
-                             0.16226857944175123E+002, 0.21882852534279891E+002,
-                             0.24966173574402408E+002, 0.25710753126453692E+002,
-                             0.24069881024271943E+002, 0.19743922403487922E+002,
-                             0.98667814246712027E+001, 0.25633359450143991E+001,
-                             0.14682471685037493E+001};
-  // compute eddy diffusivity of heat at the interfaces
-  for(int icol = 0; icol < ncol_; ++icol) {
-    for(int kk = 0; kk < nlev_; ++kk) {
-      // kvh_int_(icol, kk) = kvh_mid_(icol, kk);
-      kvh_int_(icol, kk) = kvh_e3sm[kk];
-    }
-    // kvh_int_(icol, nlev_ + 1) = kvh_mid_(icol, nlev_);
-    kvh_int_(icol, nlev_ + 1) = kvh_e3sm[nlev_ + 1];
-  }
-}
-
-void set_dgait(MAMAci::view_2d aitken_dry_dia_, const int ncol_,
-               const int nlev_) {
-  const Real dgnum_ait_e3sm[72] = {
-      0.20877713336487552E-007, 0.21782230353342090E-007,
-      0.21688324003865861E-007, 0.21112855042342451E-007,
-      0.19162058462939536E-007, 0.18102979880838476E-007,
-      0.17906980715477606E-007, 0.20271254074583327E-007,
-      0.22698983422181942E-007, 0.24134835117044986E-007,
-      0.25498156808001372E-007, 0.29796738799905547E-007,
-      0.35822987394021908E-007, 0.41170963764365215E-007,
-      0.44892726528330642E-007, 0.47217231342203107E-007,
-      0.48928661807108766E-007, 0.50170939816128735E-007,
-      0.51078750853732200E-007, 0.52247333465736065E-007,
-      0.53190758580174931E-007, 0.53576491941850044E-007,
-      0.53915614473890715E-007, 0.54510964775236826E-007,
-      0.55643231691556703E-007, 0.57057811112589899E-007,
-      0.58177383586181116E-007, 0.58209849180850108E-007,
-      0.57976751598840998E-007, 0.52000000000000002E-007,
-      0.50728746567226150E-007, 0.49119902704480870E-007,
-      0.48212162162050883E-007, 0.49227715213506454E-007,
-      0.46876827233752246E-007, 0.45360603896257791E-007,
-      0.49986783979004747E-007, 0.51186879246229022E-007,
-      0.50009353247048599E-007, 0.48250264542204811E-007,
-      0.47560278748093609E-007, 0.48298089720730957E-007,
-      0.49095935613468768E-007, 0.49493024126912931E-007,
-      0.50250797590476007E-007, 0.51949267668322422E-007,
-      0.53778727208416418E-007, 0.53563593301099588E-007,
-      0.51218136771199298E-007, 0.43171429694325200E-007,
-      0.39019610039033895E-007, 0.36175109143257051E-007,
-      0.42731638777892750E-007, 0.38060728507221777E-007,
-      0.44046323901481340E-007, 0.39216732751330010E-007,
-      0.34842233953609988E-007, 0.34068804733226066E-007,
-      0.30636043694263528E-007, 0.28302341686131413E-007,
-      0.33023014309036320E-007, 0.34745748365385196E-007,
-      0.43623545003583371E-007, 0.48206451795644064E-007,
-      0.49854490325455530E-007, 0.50346335647724146E-007,
-      0.50661560988561763E-007, 0.50986261962838767E-007,
-      0.51256955985111086E-007, 0.51482578449096488E-007,
-      0.51684364851091471E-007, 0.51849719162939729E-007};
-  for(int icol = 0; icol < ncol_; ++icol) {
-    for(int kk = 0; kk < nlev_; ++kk) {
-      aitken_dry_dia_(icol, kk) = dgnum_ait_e3sm[kk];
-    }
-  }
-}
-
 KOKKOS_INLINE_FUNCTION
 void compute_w0_and_rho(const haero::ThreadTeam &team,
                         const MAMAci::const_view_2d omega,
@@ -1051,8 +834,7 @@ void MAMAci::set_grids(
   // and we might need to revisit this.
 
   // Vertical velocity variance at midpoints
-  //add_field<Required>("w_variance", scalar3d_layout_mid, m2 / s2, grid_name);
-  add_field<Required>("w_variance", scalar3d_layout_int, m2 / s2, grid_name);
+  add_field<Required>("w_variance", scalar3d_layout_mid, m2 / s2, grid_name);
 
   // NOTE: "cldfrac_liq" is updated in SHOC. "cldfrac_liq" in C++ code is
   // equivalent to "alst" in the shoc_intr.F90. In the C++ code, it is used as
@@ -1066,8 +848,8 @@ void MAMAci::set_grids(
                       grid_name);
 
   // Eddy diffusivity for heat
-  //add_field<Required>("eddy_diff_heat", scalar3d_layout_mid, m2 / s, grid_name);
-  add_field<Required>("eddy_diff_heat", scalar3d_layout_int, m2 / s, grid_name);
+  add_field<Required>("eddy_diff_heat", scalar3d_layout_mid, m2 / s, grid_name);
+
   // Layout for 4D (2d horiz X 1d vertical x number of modes) variables
   const int num_aero_modes = mam_coupling::num_aero_modes();
   FieldLayout scalar4d_layout_mid =
@@ -1272,14 +1054,12 @@ void MAMAci::initialize_impl(const RunType run_type) {
     wet_aero_.int_aero_nmr[m] =
         get_field_out(int_nmr_field_name).get_view<Real **>();
     dry_aero_.int_aero_nmr[m] = buffer_.dry_int_aero_nmr[m];
-    //std::cout<<"index:"<<m<<" "<<int_nmr_field_name<<std::endl;
 
     // cloudborne aerosol tracers of interest: number (n) mixing ratios
     const char *cld_nmr_field_name = mam_coupling::cld_aero_nmr_field_name(m);
     wet_aero_.cld_aero_nmr[m] =
         get_field_out(cld_nmr_field_name).get_view<Real **>();
     dry_aero_.cld_aero_nmr[m] = buffer_.dry_cld_aero_nmr[m];
-    //std::cout<<"index:"<<m<<" species-CLD:"<<cld_nmr_field_name<<std::endl;
 
     for(int a = 0; a < mam_coupling::num_aero_species(); ++a) {
       // (interstitial) aerosol tracers of interest: mass (q) mixing ratios
@@ -1289,7 +1069,6 @@ void MAMAci::initialize_impl(const RunType run_type) {
       if(strlen(int_mmr_field_name) > 0) {
         wet_aero_.int_aero_mmr[m][a] =
             get_field_out(int_mmr_field_name).get_view<Real **>();
-        //std::cout<<"indices:"<<m<<", "<<a<<" "<<int_mmr_field_name<<std::endl;
         dry_aero_.int_aero_mmr[m][a] = buffer_.dry_int_aero_mmr[m][a];
       }
 
@@ -1299,7 +1078,6 @@ void MAMAci::initialize_impl(const RunType run_type) {
       if(strlen(cld_mmr_field_name) > 0) {
         wet_aero_.cld_aero_mmr[m][a] =
             get_field_out(cld_mmr_field_name).get_view<Real **>();
-        //std::cout<<"indices:"<<m<<"  "<<a<<" species-CLD:"<<int_mmr_field_name<<std::endl;
         dry_aero_.cld_aero_mmr[m][a] = buffer_.dry_cld_aero_mmr[m][a];
       }
     }
@@ -1472,22 +1250,15 @@ void MAMAci::initialize_impl(const RunType run_type) {
 //  RUN_IMPL
 // ================================================================
 void MAMAci::run_impl(const double dt) {
-  //const auto scan_policy = ekat::ExeSpaceUtils<
-  //    KT::ExeSpace>::get_thread_range_parallel_scan_team_policy(ncol_, nlev_);
-
-  // FIXME: Remove set_input and print_input
-  set_input(w_sec_int_, kvh_int_, ncol_, nlev_);
-
   const auto scan_policy = ekat::ExeSpaceUtils<
-    KT::ExeSpace>::get_thread_range_parallel_scan_team_policy(1, nlev_);
+      KT::ExeSpace>::get_thread_range_parallel_scan_team_policy(ncol_, nlev_);
 
   // preprocess input -- needs a scan for the calculation of local derivied
   // quantities
   Kokkos::parallel_for("preprocess", scan_policy, preprocess_);
   Kokkos::fence();
 
-  //haero::ThreadTeamPolicy team_policy(ncol_, Kokkos::AUTO);
-  haero::ThreadTeamPolicy team_policy(1, Kokkos::AUTO);
+  haero::ThreadTeamPolicy team_policy(ncol_, Kokkos::AUTO);
 
   // FIXME: Temporary assignment of nc
   // Kokkos::deep_copy(nc_inp_to_aci_, wet_atm_.nc);
@@ -1504,9 +1275,9 @@ void MAMAci::run_impl(const double dt) {
                      w0_, rho_);
 
   // Get w_sec_int_ from w_sec_mid_
-  /*compute_values_at_interfaces(team_policy, w_sec_mid_, dry_atm_.dz, nlev_,
+  compute_values_at_interfaces(team_policy, w_sec_mid_, dry_atm_.dz, nlev_,
                                // output
-                               w_sec_int_);*/
+                               w_sec_int_);
 
   compute_tke_using_w_sec(team_policy, w_sec_int_, nlev_,
                           // output
@@ -1523,8 +1294,6 @@ void MAMAci::run_impl(const double dt) {
   compute_aitken_dry_diameter(team_policy, dgnum_, top_lev_, nlev_,
                               // output
                               aitken_dry_dia_);
-  // FIXME:Remove set_dgait
-  set_dgait(aitken_dry_dia_, ncol_, nlev_);
 
   Kokkos::fence();  // wait for aitken_dry_dia_ to be computed.
 
@@ -1552,9 +1321,9 @@ void MAMAci::run_impl(const double dt) {
   Kokkos::fence();  // wait for rpdel_ to be computed.
 
   // Get kvh_int_ from kvh_mid_
-  /*compute_values_at_interfaces(team_policy, kvh_mid_, dry_atm_.dz, nlev_,
+  compute_values_at_interfaces(team_policy, kvh_mid_, dry_atm_.dz, nlev_,
                                // output
-                               kvh_int_);*/
+                               kvh_int_);
 
   //  Compute activated CCN number tendency (tendnd_) and updated
   //  cloud borne aerosols (stored in a work array) and interstitial
@@ -1616,14 +1385,6 @@ void MAMAci::run_impl(const double dt) {
   // call post processing to convert dry mixing ratios to wet mixing ratios
   Kokkos::parallel_for("postprocess", scan_policy, postprocess_);
   Kokkos::fence();  // wait before returning to calling function
-
-  const int kb = 62;
-  print_output(w0_(0, kb), rho_(0, kb), tke_(0, kb), wsub_(0, kb),
-               wsubice_(0, kb), wsig_(0, kb), naai_hom_(0, kb), naai_(0, kb),
-               rpdel_(0, kb), factnum_, tendnd_(0, kb), ptend_q_,
-               qqcw_fld_work_, hetfrz_immersion_nucleation_tend_(0, kb),
-               hetfrz_contact_nucleation_tend_(0, kb),
-               hetfrz_depostion_nucleation_tend_(0, kb), dry_aero_, kb);
 }
 
 }  // namespace scream
diff --git a/components/eamxx/src/physics/mam/mam_coupling.hpp b/components/eamxx/src/physics/mam/mam_coupling.hpp
index ab7b18c83c7..2d89b573a54 100644
--- a/components/eamxx/src/physics/mam/mam_coupling.hpp
+++ b/components/eamxx/src/physics/mam/mam_coupling.hpp
@@ -548,12 +548,9 @@ mam4::Prognostics interstitial_aerosols_for_column(const AerosolState& dry_aero,
     EKAT_KERNEL_ASSERT_MSG(dry_aero.int_aero_nmr[m].data(),
       "int_aero_nmr not defined for dry aerosol state!");
     progs.n_mode_i[m] = ekat::subview(dry_aero.int_aero_nmr[m], column_index);
-    //std::cout<<"progs.n_mode_i index:"<<m<<" stores int_aero_nmr index:"<<m<<std::endl;
     for (int a = 0; a < num_aero_species(); ++a) {
       if (dry_aero.int_aero_mmr[m][a].data()) {
-        int prg_idx = a;//mam4::utils::get_prognostics_index(m,a);//Index of HAERO's prognostics 
-        progs.q_aero_i[m][prg_idx] = ekat::subview(dry_aero.int_aero_mmr[m][a], column_index);
-        //std::cout<<"progs.q_aero_i indices:"<<m<<" "<<a<<" stores int_aero_mmr indices:"<<m<<" "<<a<<std::endl;
+        progs.q_aero_i[m][a] = ekat::subview(dry_aero.int_aero_mmr[m][a], column_index);
       }
     }
   }
@@ -578,8 +575,7 @@ mam4::Prognostics aerosols_for_column(const AerosolState& dry_aero,
     progs.n_mode_c[m] = ekat::subview(dry_aero.cld_aero_nmr[m], column_index);
     for (int a = 0; a < num_aero_species(); ++a) {
       if (dry_aero.cld_aero_mmr[m][a].data()) {
-        int prg_idx = a;//mam4::utils::get_prognostics_index(m,a); //Index of HAERO's prognostics array
-        progs.q_aero_c[m][prg_idx] = ekat::subview(dry_aero.cld_aero_mmr[m][a], column_index);
+        progs.q_aero_c[m][a] = ekat::subview(dry_aero.cld_aero_mmr[m][a], column_index);
       }
     }
   }
@@ -673,21 +669,21 @@ void compute_dry_mixing_ratios(const Team& team,
   Kokkos::parallel_for(Kokkos::TeamVectorRange(team, nlev), [&] (const int k) {
     const auto qv_ik = wet_atm.qv(i,k);
     for (int m = 0; m < num_aero_modes(); ++m) {
-      dry_aero.int_aero_nmr[m](i,k) = wet_aero.int_aero_nmr[m](i,k);//PF::calculate_drymmr_from_wetmmr(wet_aero.int_aero_nmr[m](i,k), qv_ik);
+      dry_aero.int_aero_nmr[m](i,k) = PF::calculate_drymmr_from_wetmmr(wet_aero.int_aero_nmr[m](i,k), qv_ik);
       if (dry_aero.cld_aero_nmr[m].data()) {
-        dry_aero.cld_aero_nmr[m](i,k) = wet_aero.cld_aero_nmr[m](i,k);//PF::calculate_drymmr_from_wetmmr(wet_aero.cld_aero_nmr[m](i,k), qv_ik);
+        dry_aero.cld_aero_nmr[m](i,k) = PF::calculate_drymmr_from_wetmmr(wet_aero.cld_aero_nmr[m](i,k), qv_ik);
       }
       for (int a = 0; a < num_aero_species(); ++a) {
         if (dry_aero.int_aero_mmr[m][a].data()) {
-          dry_aero.int_aero_mmr[m][a](i,k) = wet_aero.int_aero_mmr[m][a](i,k);//PF::calculate_drymmr_from_wetmmr(wet_aero.int_aero_mmr[m][a](i,k), qv_ik);
+          dry_aero.int_aero_mmr[m][a](i,k) = PF::calculate_drymmr_from_wetmmr(wet_aero.int_aero_mmr[m][a](i,k), qv_ik);
         }
         if (dry_aero.cld_aero_mmr[m][a].data()) {
-          dry_aero.cld_aero_mmr[m][a](i,k) = wet_aero.cld_aero_mmr[m][a](i,k);//PF::calculate_drymmr_from_wetmmr(wet_aero.cld_aero_mmr[m][a](i,k), qv_ik);
+          dry_aero.cld_aero_mmr[m][a](i,k) = PF::calculate_drymmr_from_wetmmr(wet_aero.cld_aero_mmr[m][a](i,k), qv_ik);
         }
       }
     }
     for (int g = 0; g < num_aero_gases(); ++g) {
-      dry_aero.gas_mmr[g](i,k) = wet_aero.gas_mmr[g](i,k);//PF::calculate_drymmr_from_wetmmr(wet_aero.gas_mmr[g](i,k), qv_ik);
+      dry_aero.gas_mmr[g](i,k) = PF::calculate_drymmr_from_wetmmr(wet_aero.gas_mmr[g](i,k), qv_ik);
     }
   });
 }
diff --git a/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt b/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt
index 296e7a2858b..8c5028828bb 100644
--- a/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt
+++ b/components/eamxx/tests/single-process/mam/aci/CMakeLists.txt
@@ -12,8 +12,7 @@ CreateADUnitTest(${TEST_BASE_NAME}
 )
 
 # Set AD configurable options
-#SetVarDependingOnTestSize(NUM_STEPS 12 24 36)
-SetVarDependingOnTestSize(NUM_STEPS 1 1 1)
+SetVarDependingOnTestSize(NUM_STEPS 12 24 36)
 set (ATM_TIME_STEP 600)
 set (RUN_T0 2021-10-12-45000)
 
diff --git a/components/eamxx/tests/single-process/mam/aci/input.yaml b/components/eamxx/tests/single-process/mam/aci/input.yaml
index 75896114408..fe26d828d41 100644
--- a/components/eamxx/tests/single-process/mam/aci/input.yaml
+++ b/components/eamxx/tests/single-process/mam/aci/input.yaml
@@ -26,8 +26,7 @@ grids_manager:
 
 initial_conditions:
   # The name of the file containing the initial conditions for this test.
-  #Filename: ${SCREAM_DATA_DIR}/init/${EAMxx_tests_IC_FILE_MAM4xx_72lev}
-  Filename: /qfs/people/sing201/eagles/refactor_mam/mam4xx_scream/screami_unit_tests_mam4xx_ne2np4L72_LAT_71p9201421331276_LON_286p572525837053.nc
+  Filename: ${SCREAM_DATA_DIR}/init/${EAMxx_tests_IC_FILE_MAM4xx_72lev}
   topography_filename: ${TOPO_DATA_DIR}/${EAMxx_tests_TOPO_FILE}
   phis : 1.0
   #These should come from the input file
@@ -35,6 +34,9 @@ initial_conditions:
   #we should get the following variables from other processes
   pbl_height : 1.0
   dgnum: 4.362354500358337E-008
+  cldfrac_liq_prev: 0.138584624960092
+  eddy_diff_heat: 0.620820118789603 
+  w_variance:  1.110977269289875E-002
 
 # The parameters for I/O control
 Scorpio: