diff --git a/plugin/uvm_gen.vim b/plugin/uvm_gen.vim
index 0526062..82e07c7 100644
--- a/plugin/uvm_gen.vim
+++ b/plugin/uvm_gen.vim
@@ -175,9 +175,8 @@ function! UVMTest(name)
         let name_temp = "base_test"
         let parent_name = "uvm_test"
     else
-        " let a:name_temp = a:name . "_test"
-        let name_temp = "test"
-        let parent_name = "base_base"
+        let name_temp = a:name . "_test"
+        let parent_name = "base"
     endif
     call <SID>TExpand("NAME", name_temp)
     call <SID>TExpand("PARENT", parent_name)
diff --git a/templates/uvm_test.sv b/templates/uvm_test.sv
index 7c2f237..61d94e0 100644
--- a/templates/uvm_test.sv
+++ b/templates/uvm_test.sv
@@ -4,7 +4,7 @@
 //------------------------------------------------------------------------------
 // Class Description
 //------------------------------------------------------------------------------
-class {:NAME:} extends uvm_test;
+class {:NAME:} extends {:PARENT:}_test;
 
     //------------------------------------------
     // UVM Factory Registration Macro