diff --git a/userspace/units/gr/config/nvgpu-gr-config.h b/userspace/units/gr/config/nvgpu-gr-config.h
index c87a10f48..2b9376e58 100644
--- a/userspace/units/gr/config/nvgpu-gr-config.h
+++ b/userspace/units/gr/config/nvgpu-gr-config.h
@@ -42,7 +42,11 @@ struct unit_module;
  *
  * Test Type: Feature
  *
- * Targets: #nvgpu_gr_config_init
+ * Targets: nvgpu_gr_config_init,
+ *          gm20b_gr_config_get_pes_tpc_mask,
+ *          gm20b_gr_config_get_pd_dist_skip_table_size,
+ *          gm20b_gr_config_get_tpc_count_in_gpc,
+ *          gm20b_gr_config_get_gpc_tpc_mask
  *
  * Input: None
  *
@@ -61,7 +65,7 @@ int test_gr_config_init(struct unit_module *m, struct gk20a *g, void *args);
  *
  * Test Type: Feature
  *
- * Targets: #nvgpu_gr_config_deinit
+ * Targets: nvgpu_gr_config_deinit
  *
  * Input: #test_gr_init_setup and #test_gr_config_init
  *        must have been executed successfully.
@@ -83,22 +87,22 @@ int test_gr_config_deinit(struct unit_module *m, struct gk20a *g, void *args);
  *
  * Test Type: Feature, Error guessing
  *
- * Targets: #nvgpu_gr_config_get_max_gpc_count,
- *          #nvgpu_gr_config_get_max_tpc_count,
- *          #nvgpu_gr_config_get_max_tpc_per_gpc_count,
- *          #nvgpu_gr_config_get_gpc_count,
- *          #nvgpu_gr_config_get_tpc_count,
- *          #nvgpu_gr_config_get_ppc_count,
- *          #nvgpu_gr_config_get_pe_count_per_gpc,
- *          #nvgpu_gr_config_get_sm_count_per_tpc,
- *          #nvgpu_gr_config_get_gpc_mask,
- *          #nvgpu_gr_config_get_gpc_ppc_count,
- *          #nvgpu_gr_config_get_gpc_skip_mask,
- *          #nvgpu_gr_config_get_gpc_tpc_count,
- *          #nvgpu_gr_config_get_pes_tpc_count,
- *          #nvgpu_gr_config_get_pes_tpc_mask,
- *          #nvgpu_gr_config_get_gpc_tpc_count_base,
- *          #nvgpu_gr_config_get_gpc_tpc_mask_base
+ * Targets: nvgpu_gr_config_get_max_gpc_count,
+ *          nvgpu_gr_config_get_max_tpc_count,
+ *          nvgpu_gr_config_get_max_tpc_per_gpc_count,
+ *          nvgpu_gr_config_get_gpc_count,
+ *          nvgpu_gr_config_get_tpc_count,
+ *          nvgpu_gr_config_get_ppc_count,
+ *          nvgpu_gr_config_get_pe_count_per_gpc,
+ *          nvgpu_gr_config_get_sm_count_per_tpc,
+ *          nvgpu_gr_config_get_gpc_mask,
+ *          nvgpu_gr_config_get_gpc_ppc_count,
+ *          nvgpu_gr_config_get_gpc_skip_mask,
+ *          nvgpu_gr_config_get_gpc_tpc_count,
+ *          nvgpu_gr_config_get_pes_tpc_count,
+ *          nvgpu_gr_config_get_pes_tpc_mask,
+ *          nvgpu_gr_config_get_gpc_tpc_count_base,
+ *          nvgpu_gr_config_get_gpc_tpc_mask_base
  *
  * Input: #test_gr_init_setup and #test_gr_config_init
  *        must have been executed successfully.
@@ -122,19 +126,19 @@ int test_gr_config_count(struct unit_module *m, struct gk20a *g, void *args);
  *
  * Test Type: Feature, Error guessing
  *
- * Targets: #nvgpu_gr_config_set_no_of_sm,
- *          #nvgpu_gr_config_get_no_of_sm,
- *          #nvgpu_gr_config_get_sm_info,
- *          #nvgpu_gr_config_set_sm_info_gpc_index,
- *          #nvgpu_gr_config_get_sm_info_gpc_index,
- *          #nvgpu_gr_config_set_sm_info_tpc_index,
- *          #nvgpu_gr_config_get_sm_info_tpc_index,
- *          #nvgpu_gr_config_set_sm_info_global_tpc_index,
- *          #nvgpu_gr_config_get_sm_info_global_tpc_index,
- *          #nvgpu_gr_config_set_sm_info_sm_index,
- *          #nvgpu_gr_config_get_sm_info_sm_index,
- *          #nvgpu_gr_config_set_gpc_tpc_mask,
- *          #nvgpu_gr_config_get_gpc_tpc_mask
+ * Targets: nvgpu_gr_config_set_no_of_sm,
+ *          nvgpu_gr_config_get_no_of_sm,
+ *          nvgpu_gr_config_get_sm_info,
+ *          nvgpu_gr_config_set_sm_info_gpc_index,
+ *          nvgpu_gr_config_get_sm_info_gpc_index,
+ *          nvgpu_gr_config_set_sm_info_tpc_index,
+ *          nvgpu_gr_config_get_sm_info_tpc_index,
+ *          nvgpu_gr_config_set_sm_info_global_tpc_index,
+ *          nvgpu_gr_config_get_sm_info_global_tpc_index,
+ *          nvgpu_gr_config_set_sm_info_sm_index,
+ *          nvgpu_gr_config_get_sm_info_sm_index,
+ *          nvgpu_gr_config_set_gpc_tpc_mask,
+ *          nvgpu_gr_config_get_gpc_tpc_mask
  *
  * Input: #test_gr_init_setup and #test_gr_config_init
  *        must have been executed successfully.
@@ -157,10 +161,11 @@ int test_gr_config_set_get(struct unit_module *m, struct gk20a *g, void *args);
  *
  * Test Type: Feature, Error guessing
  *
- * Targets: #nvgpu_gr_config_init,
- *          #nvgpu_gr_config_deinit,
+ * Targets: nvgpu_gr_config_init,
+ *          nvgpu_gr_config_deinit,
  *          gops_gr_config.init_sm_id_table,
- *          gv100_gr_config_init_sm_id_table
+ *          gv100_gr_config_init_sm_id_table,
+ *          nvgpu_gr_get_config_ptr
  *
  * Input: #test_gr_init_setup must have been executed successfully.
  *