diff --git a/userspace/units/fifo/engine/nvgpu-engine-status.h b/userspace/units/fifo/engine/nvgpu-engine-status.h
index 0abd90117..a45764a51 100644
--- a/userspace/units/fifo/engine/nvgpu-engine-status.h
+++ b/userspace/units/fifo/engine/nvgpu-engine-status.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,13 +43,15 @@ struct gk20a;
  * Test Type: Feature based
  *
  * Targets: nvgpu_engine_status_is_ctxsw_switch,
- * 	nvgpu_engine_status_is_ctxsw_load,
- * 	nvgpu_engine_status_is_ctxsw_save,
- * 	nvgpu_engine_status_is_ctxsw,
- * 	nvgpu_engine_status_is_ctxsw_invalid,
- * 	nvgpu_engine_status_is_ctxsw_valid,
- * 	nvgpu_engine_status_is_ctx_type_tsg,
- * 	nvgpu_engine_status_is_next_ctx_type_tsg
+ *	nvgpu_engine_status_is_ctxsw_load,
+ *	nvgpu_engine_status_is_ctxsw_save,
+ *	nvgpu_engine_status_is_ctxsw,
+ *	nvgpu_engine_status_is_ctxsw_invalid,
+ *	nvgpu_engine_status_is_ctxsw_valid,
+ *	nvgpu_engine_status_is_ctx_type_tsg,
+ *	nvgpu_engine_status_is_next_ctx_type_tsg,
+ *	nvgpu_engine_status_get_ctx_id_type,
+ *	nvgpu_engine_status_get_next_ctx_id_type
  *
  * Input: None
  *
diff --git a/userspace/units/fifo/pbdma/gm20b/nvgpu-pbdma-gm20b.h b/userspace/units/fifo/pbdma/gm20b/nvgpu-pbdma-gm20b.h
index 9793d8dad..67d017986 100644
--- a/userspace/units/fifo/pbdma/gm20b/nvgpu-pbdma-gm20b.h
+++ b/userspace/units/fifo/pbdma/gm20b/nvgpu-pbdma-gm20b.h
@@ -99,7 +99,8 @@ int test_gm20b_pbdma_handle_intr(struct unit_module *m,
  * Test Type: Feature
  *
  * Targets: gops_pbdma.handle_intr_0, gm20b_pbdma_handle_intr_0,
- *          gops_pbdma.reset_header, gm20b_pbdma_reset_header
+ *          gops_pbdma.reset_header, gm20b_pbdma_reset_header,
+ *          gm20b_pbdma_reset_method
  *
  * Input: test_fifo_init_support() run for this GPU
  *
@@ -157,8 +158,8 @@ int test_gm20b_pbdma_read_data(struct unit_module *m,
  *
  * Targets: gops_pbdma.device_fatal_0_intr_descs,
  *          gm20b_pbdma_device_fatal_0_intr_descs,
- *          gops_pbdma.restartable_0_intr_descs
- *          gm20b_pbdma_restartable_0_intr_descs.
+ *          gops_pbdma.restartable_0_intr_descs,
+ *          gm20b_pbdma_restartable_0_intr_descs
  *
  * Input: test_fifo_init_support() run for this GPU
  *
diff --git a/userspace/units/fifo/pbdma/gv11b/nvgpu-pbdma-gv11b.h b/userspace/units/fifo/pbdma/gv11b/nvgpu-pbdma-gv11b.h
index 0be2ec009..2191600b1 100644
--- a/userspace/units/fifo/pbdma/gv11b/nvgpu-pbdma-gv11b.h
+++ b/userspace/units/fifo/pbdma/gv11b/nvgpu-pbdma-gv11b.h
@@ -61,7 +61,9 @@ int test_gv11b_pbdma_setup_hw(struct unit_module *m,
  *
  * Test Type: Feature
  *
- * Targets: gops_pbdma.intr_enable, gv11b_pbdma_intr_enable
+ * Targets: gops_pbdma.intr_enable, gv11b_pbdma_intr_enable,
+ *          gm20b_pbdma_disable_and_clear_all_intr,
+ *          gm20b_pbdma_clear_all_intr
  *
  * Input: test_fifo_init_support() run for this GPU
  *
@@ -167,7 +169,8 @@ int test_gv11b_pbdma_intr_descs(struct unit_module *m,
  * Test Type: Feature
  *
  * Targets: gops_pbdma.get_fc_pb_header, gv11b_pbdma_get_fc_pb_header,
- *          gops_pbdma.get_fc_target, gv11b_pbdma_get_fc_target
+ *          gops_pbdma.get_fc_target, gv11b_pbdma_get_fc_target,
+ *          gm20b_pbdma_get_fc_target
  *
  * Input: test_fifo_init_support() run for this GPU
  *
diff --git a/userspace/units/init/nvgpu-init.h b/userspace/units/init/nvgpu-init.h
index c9cc2fc96..6d783bede 100644
--- a/userspace/units/init/nvgpu-init.h
+++ b/userspace/units/init/nvgpu-init.h
@@ -307,7 +307,8 @@ int test_poweroff(struct unit_module *m, struct gk20a *g, void *args);
  * Test Type: Feature
  *
  * Targets: nvgpu_sw_quiesce_init_support, nvgpu_sw_quiesce_remove_support,
- *          nvgpu_sw_quiesce_thread, nvgpu_sw_quiesce, nvgpu_sw_quiesce_bug_cb
+ *          nvgpu_sw_quiesce_thread, nvgpu_sw_quiesce, nvgpu_sw_quiesce_bug_cb,
+ *          nvgpu_bug_exit
  *
  * Input:
  * - test_setup_env() must be called before.
diff --git a/userspace/units/posix/bug/posix-bug.h b/userspace/units/posix/bug/posix-bug.h
index 3661a41ec..db8a78346 100644
--- a/userspace/units/posix/bug/posix-bug.h
+++ b/userspace/units/posix/bug/posix-bug.h
@@ -67,7 +67,8 @@ int test_expect_bug(struct unit_module *m, struct gk20a *g, void *args);
  *
  * Test Type: Feature
  *
- * Targets: nvgpu_bug_register_cb, nvgpu_bug_unregister_cb
+ * Targets: nvgpu_bug_register_cb, nvgpu_bug_unregister_cb,
+ *          nvgpu_bug_cb_from_node
  *
  * Inputs: None
  *