diff --git a/srsue/hdr/stack/upper/nas.h b/srsue/hdr/stack/upper/nas.h
index 674bb2f2e..3bdf2f650 100644
--- a/srsue/hdr/stack/upper/nas.h
+++ b/srsue/hdr/stack/upper/nas.h
@@ -232,7 +232,12 @@ private:
   void send_activate_test_mode_complete();
   void send_close_ue_test_loop_complete();
 
-  // Other internal helpers
+  // Airplane mode simulator helpers
+  void start_airplane_mode_sim();
+  void airplane_mode_sim_switch_off();
+  void airplane_mode_sim_switch_on();
+
+  // FSM Helpers
   void enter_state(emm_state_t state_);
   void enter_emm_null();
   void enter_emm_deregistered(emm_state_t::deregistered_substate_t substate);
diff --git a/srsue/test/upper/nas_test.cc b/srsue/test/upper/nas_test.cc
index abc911b2e..e7ddfc152 100644
--- a/srsue/test/upper/nas_test.cc
+++ b/srsue/test/upper/nas_test.cc
@@ -154,16 +154,13 @@ public:
     nas = nas_;
     start(-1);
   }
-  bool switch_on()
-  {
-    return true;
-  }
+  bool switch_on() { return true; }
   void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu) { pdcp->write_sdu(lcid, std::move(sdu)); }
   bool is_lcid_enabled(uint32_t lcid) { return pdcp->is_lcid_enabled(lcid); }
 
-  bool is_attached(){return true;}
+  bool is_attached() { return true; }
 
-  bool start_service_request(){return true;}
+  bool start_service_request() { return true; }
 
   void run_thread()
   {
@@ -179,7 +176,7 @@ public:
     running = false;
     wait_thread_finish();
   }
-  srslte::log_ref stack_log{"STACK"};
+  srslte::log_ref    stack_log{"STCK"};
   pdcp_interface_gw* pdcp    = nullptr;
   srsue::nas*        nas     = nullptr;
   bool               running = false;