diff --git a/ngcp/avp.lua b/ngcp/avp.lua
index 50d0441..f03b855 100644
--- a/ngcp/avp.lua
+++ b/ngcp/avp.lua
@@ -9,7 +9,7 @@ NGCPAvp_MT = {
 }
 
     function NGCPAvp:new(id)
-        local t = { id = "$(avp(s:" .. id .. "))" }
+        local t = { id = "$avp(s:" .. id .. ")" }
         NGCPAvp_MT.__call = function(t, value)
             if not value then
                 --print(table.tostring(sr.pv.vars))
diff --git a/tests/ngcp_dp.lua b/tests/ngcp_dp.lua
index a6eb111..35ebc89 100644
--- a/tests/ngcp_dp.lua
+++ b/tests/ngcp_dp.lua
@@ -20,7 +20,7 @@ package.preload['luasql.mysql'] = function ()
 end
 
 require 'ngcp.dp'
-require 'tests.dp_vars'
+require 'tests_v.dp_vars'
 
 TestNGCPDomainPrefs = {} --class
 
diff --git a/tests/ngcp_pp.lua b/tests/ngcp_pp.lua
index a23d2a8..af985a3 100644
--- a/tests/ngcp_pp.lua
+++ b/tests/ngcp_pp.lua
@@ -20,7 +20,7 @@ package.preload['luasql.mysql'] = function ()
 end
 
 require 'ngcp.pp'
-require 'tests.pp_vars'
+require 'tests_v.pp_vars'
 
 TestNGCPPeerPrefs = {} --class
 
diff --git a/tests/ngcp_up.lua b/tests/ngcp_up.lua
index 1461a09..ad2143a 100644
--- a/tests/ngcp_up.lua
+++ b/tests/ngcp_up.lua
@@ -20,7 +20,7 @@ package.preload['luasql.mysql'] = function ()
 end
 
 require 'ngcp.up'
-require 'tests.up_vars'
+require 'tests_v.up_vars'
 
 TestNGCPUserPrefs = {} --class
 
diff --git a/tests/dp_vars.lua b/tests_v/dp_vars.lua
similarity index 100%
rename from tests/dp_vars.lua
rename to tests_v/dp_vars.lua
diff --git a/tests/pp_vars.lua b/tests_v/pp_vars.lua
similarity index 100%
rename from tests/pp_vars.lua
rename to tests_v/pp_vars.lua
diff --git a/tests/up_vars.lua b/tests_v/up_vars.lua
similarity index 100%
rename from tests/up_vars.lua
rename to tests_v/up_vars.lua