diff --git a/cmd/cgr-tester/cgr-tester.go b/cmd/cgr-tester/cgr-tester.go
index 2c032f907..76a816e82 100644
--- a/cmd/cgr-tester/cgr-tester.go
+++ b/cmd/cgr-tester/cgr-tester.go
@@ -53,9 +53,9 @@ var (
 	dbdata_encoding = flag.String("dbdata_encoding", cgrConfig.DBDataEncoding, "The encoding used to store object data in strings.")
 	raterAddress    = flag.String("rater_address", "", "Rater address for remote tests. Empty for internal rater.")
 	tor             = flag.String("tor", "call", "The type of record to use in queries.")
-	tenant          = flag.String("tenant", "call", "The type of record to use in queries.")
+	tenant          = flag.String("tenant", "cgrates.org", "The type of record to use in queries.")
 	subject         = flag.String("subject", "1001", "The rating subject to use in queries.")
-	destination     = flag.String("destination", "+4986517174963", "The destination to use in queries.")
+	destination     = flag.String("destination", "1002", "The destination to use in queries.")
 
 	nilDuration = time.Duration(0)
 )
@@ -150,8 +150,8 @@ func main() {
 		defer pprof.StopCPUProfile()
 	}
 	cd := &engine.CallDescriptor{
-		TimeStart:    time.Date(2013, time.December, 13, 22, 30, 0, 0, time.UTC),
-		TimeEnd:      time.Date(2013, time.December, 13, 22, 31, 0, 0, time.UTC),
+		TimeStart:    time.Date(2014, time.December, 11, 55, 30, 0, 0, time.UTC),
+		TimeEnd:      time.Date(2014, time.December, 11, 55, 31, 0, 0, time.UTC),
 		CallDuration: 60 * time.Second,
 		Direction:    "*out",
 		TOR:          *tor,
diff --git a/data/tester/cgr-tester.py b/data/tester/cgr-tester.py
index 8993fa4d9..dbb99029d 100644
--- a/data/tester/cgr-tester.py
+++ b/data/tester/cgr-tester.py
@@ -47,9 +47,9 @@ cd = {"Direction":"*out",
       "TOR":"call",
       "Tenant": "cgrates.org",
       "Subject": "1001",
-      "Destination": "+49",
-      "TimeStart": "2013-08-07T17:30:00Z",
-      "TimeEnd": "2013-08-07T18:30:00Z",
+      "Destination": "1002",
+      "TimeStart": "2014-04-03T11:12:23.190554134+02:00",
+      "TimeEnd": "2014-04-03T11:13:23.190554134+02:00",
       "CallDuration": 60000000000,
 }
 
@@ -60,7 +60,7 @@ cd = {"Direction":"*out",
 
 start_time = time.time()
 i = 0
-runs = 1e5
+runs = 5e5
 result = ""
 for i in range(int(runs) + 1):
     result = rpc.call("Responder.GetCost", cd)
diff --git a/engine/action.go b/engine/action.go
index c0dc08373..3667e1f49 100644
--- a/engine/action.go
+++ b/engine/action.go
@@ -58,8 +58,8 @@ const (
 	DEBIT          = "*debit"
 	RESET_COUNTER  = "*reset_counter"
 	RESET_COUNTERS = "*reset_counters"
-	ENABLE_USER    = "*enable_user"
-	DISABLE_USER   = "*disable_user"
+	ENABLE_ACCOUNT    = "*enable_account"
+	DISABLE_ACCOUNT   = "*disable_account"
 	CALL_URL       = "*call_url"
 	CALL_URL_ASYNC = "*call_url_async"
 	MAIL_ASYNC     = "*mail_async"
@@ -90,9 +90,9 @@ func getActionFunc(typ string) (actionTypeFunc, bool) {
 		return resetCounterAction, true
 	case RESET_COUNTERS:
 		return resetCountersAction, true
-	case ENABLE_USER:
+	case ENABLE_ACCOUNT:
 		return enableUserAction, true
-	case DISABLE_USER:
+	case DISABLE_ACCOUNT:
 		return disableUserAction, true
 	case CALL_URL:
 		return callUrl, true