diff --git a/tests/automatic/full_chain/simple_chain/check_windows.bat b/tests/automatic/full_chain/simple_chain/check_windows.bat
index 906f801f9fe7f2b81a39e3d48d6541b40a75baae..35ecdb57ddd5e9330947d697013774809a4543e4 100644
--- a/tests/automatic/full_chain/simple_chain/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain/check_windows.bat
@@ -1,5 +1,5 @@
 SET mongo_exe="c:\Program Files\MongoDB\Server\3.6\bin\mongo.exe"
-set beamtime_id="asapo_test"
+SET beamtime_id=asapo_test
 SET receiver_folder="c:\tmp\asapo\receiver\files\%beamtime_id%"
 set proxy_address="127.0.0.1:8400"
 
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
index c1a0d017339d9195da81048b0b0bb8282bf21e66..64c39dcc94409bea1ac1e9ae5485b55a88d0b262 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
@@ -14,14 +14,14 @@ ping 1.0.0.0 -n 1 -w 100 > nul
 
 mkdir %receiver_folder%
 
-%1 localhost:8400 %beamtime_id% 100 1 1 0 30
+"%1" localhost:8400 %beamtime_id% 100 1 1 0 30
 
 ping 1.0.0.0 -n 1 -w 100 > nul
 
 FOR /F "usebackq" %%A IN ('%receiver_folder%\1.bin') DO set size=%%~zA
 if %size% NEQ 102400 goto :error
 
-%1 localhost:8400 wrong_id 100 1 1 0 10 | findstr /c:"Processed 1000 file(s)"  || goto :error
+"%1" localhost:8400 wrong_id 100 1 1 0 2 2>1 | findstr /c:"authorization failed"  || goto :error
 
 goto :clean
 
diff --git a/tests/manual/performance_full_chain_simple/authorizer.json b/tests/manual/performance_full_chain_simple/authorizer.json
new file mode 100644
index 0000000000000000000000000000000000000000..4018a0ba239fd5d8311a3d75c861a7bded6cb0d1
--- /dev/null
+++ b/tests/manual/performance_full_chain_simple/authorizer.json
@@ -0,0 +1,6 @@
+{
+  "Port": 5007,
+  "LogLevel":"info"
+}
+
+
diff --git a/tests/manual/performance_full_chain_simple/receiver.json b/tests/manual/performance_full_chain_simple/receiver.json
index adf89f8ee2e32fef2d2ea21ca5e3d271a6071d65..8974d937b402f5622452a00944d9431561151b65 100644
--- a/tests/manual/performance_full_chain_simple/receiver.json
+++ b/tests/manual/performance_full_chain_simple/receiver.json
@@ -2,7 +2,8 @@
   "MonitorDbAddress":"localhost:8086",
   "MonitorDbName": "db_test",
   "BrokerDbAddress":"localhost:27017",
-  "BrokerDbName": "test_run",
+  "AuthorizationServer": "localhost:5007",
+  "AuthorizationInterval": 10000,
   "ListenPort":4200,
   "WriteToDisk":true,
   "WriteToDb":true,
diff --git a/tests/manual/performance_full_chain_simple/test.sh b/tests/manual/performance_full_chain_simple/test.sh
index 3ddd186fb746e14c1b473bba8973e0127721ac3a..8e546b72325c72587b87af46a87e84f4c53595ac 100755
--- a/tests/manual/performance_full_chain_simple/test.sh
+++ b/tests/manual/performance_full_chain_simple/test.sh
@@ -7,13 +7,17 @@ trap Cleanup EXIT
 #clean-up
 Cleanup() {
 set +e
-ssh ${receiver_node} rm -f ${receiver_dir}/files/*
+ssh ${receiver_node} rm -f ${receiver_dir}/files/${beamtime_id}/*
 ssh ${receiver_node} killall receiver
 ssh ${receiver_node} killall asapo-discovery
+ssh ${receiver_node} killall asapo-authorizer
 ssh ${broker_node} killall asapo-broker
 ssh ${broker_node} docker rm -f -v mongo
 }
 
+beamtime_id=asapo_test
+
+
 #monitoring_setup
 monitor_node=zitpcx27016
 monitor_port=8086
@@ -26,14 +30,15 @@ log_dir=~/fullchain_tests/logs
 # runs producer with various file sizes from $producer_node and measures performance
 
 file_size=10000
-file_num=$((10000000 / $file_size))
+#file_num=$((10000000 / $file_size))
+file_num=$((100000 / $file_size))
 echo filesize: ${file_size}K, filenum: $file_num
 
 # receiver_setup
 receiver_node=max-wgs
 receiver_port=4201
 receiver_dir=/gpfs/petra3/scratch/yakubov/receiver_tests
-ssh ${receiver_node} mkdir -p ${receiver_dir}/files
+ssh ${receiver_node} mkdir -p ${receiver_dir}/files/${beamtime_id}
 scp ../../../cmake-build-release/receiver/receiver ${receiver_node}:${receiver_dir}
 cat receiver.json |
   jq "to_entries |
@@ -49,6 +54,10 @@ cat receiver.json |
 scp receiver_tmp.json ${receiver_node}:${receiver_dir}/receiver.json
 rm receiver_tmp.json
 
+#authorizer_setup
+scp ../../../cmake-build-release/authorizer/asapo-authorizer ${receiver_node}:${receiver_dir}
+scp authorizer.json ${receiver_node}:${receiver_dir}/authorizer.json
+
 
 # discovery_setup
 discovery_port=5006
@@ -114,6 +123,9 @@ ssh ${broker_node} docker run -d -p 27017:27017 --name mongo mongo
 ssh ${receiver_node} "bash -c 'cd ${receiver_dir}; nohup ./asapo-discovery -config discovery.json &> ${log_dir}/discovery.log &'"
 sleep 0.3
 
+#authorizer_start
+ssh ${receiver_node} "bash -c 'cd ${receiver_dir}; nohup ./asapo-authorizer -config authorizer.json &> ${log_dir}/log.authorizer &'"
+
 #receiver_start
 ssh ${receiver_node} "bash -c 'cd ${receiver_dir}; nohup ./receiver receiver.json &> ${log_dir}/log.receiver &'"
 sleep 0.3
@@ -125,10 +137,11 @@ sleep 0.3
 sleep 5
 
 #producer_start
-ssh ${producer_node} "bash -c 'cd ${producer_dir}; nohup ./dummy-data-producer ${receiver_node}:8400 ${file_size} ${file_num} ${producer_nthreads} 0 &> ${log_dir}/producer.log &'"
+ssh ${producer_node} "bash -c 'cd ${producer_dir}; nohup ./dummy-data-producer ${receiver_node}:8400 ${beamtime_id} ${file_size} ${file_num} ${producer_nthreads} 0 100 &> ${log_dir}/producer.log &'"
 
 sleep 1
 
 #worker_start
-ssh ${worker_node} ${worker_dir}/getnext_broker ${receiver_node}:8400 test_run ${nthreads}
+ssh ${worker_node} ${worker_dir}/getnext_broker ${receiver_node}:8400 ${beamtime_id} ${nthreads}
+
 
diff --git a/tests/manual/performance_producer_receiver/authorizer.json b/tests/manual/performance_producer_receiver/authorizer.json
new file mode 100644
index 0000000000000000000000000000000000000000..4018a0ba239fd5d8311a3d75c861a7bded6cb0d1
--- /dev/null
+++ b/tests/manual/performance_producer_receiver/authorizer.json
@@ -0,0 +1,6 @@
+{
+  "Port": 5007,
+  "LogLevel":"info"
+}
+
+
diff --git a/tests/manual/performance_producer_receiver/receiver.json b/tests/manual/performance_producer_receiver/receiver.json
index adf89f8ee2e32fef2d2ea21ca5e3d271a6071d65..8974d937b402f5622452a00944d9431561151b65 100644
--- a/tests/manual/performance_producer_receiver/receiver.json
+++ b/tests/manual/performance_producer_receiver/receiver.json
@@ -2,7 +2,8 @@
   "MonitorDbAddress":"localhost:8086",
   "MonitorDbName": "db_test",
   "BrokerDbAddress":"localhost:27017",
-  "BrokerDbName": "test_run",
+  "AuthorizationServer": "localhost:5007",
+  "AuthorizationInterval": 10000,
   "ListenPort":4200,
   "WriteToDisk":true,
   "WriteToDb":true,
diff --git a/tests/manual/performance_producer_receiver/test.sh b/tests/manual/performance_producer_receiver/test.sh
index 53f9dfe6f417defc8eab078a206221cea07f4d52..f8b4a25f870125f4f006cd5542d4973505a9d3fe 100755
--- a/tests/manual/performance_producer_receiver/test.sh
+++ b/tests/manual/performance_producer_receiver/test.sh
@@ -6,9 +6,10 @@ trap Cleanup EXIT
 
 Cleanup() {
 set +e
-ssh ${service_node} rm -f ${service_dir}/files/*
+ssh ${service_node} rm -f ${service_dir}/files/${beamtime_id}/*
 ssh ${service_node} killall receiver
 ssh ${service_node} killall asapo-discovery
+ssh ${service_node} killall asapo-authorizer
 ssh ${service_node} docker rm -f -v mongo
 }
 
@@ -21,6 +22,8 @@ service_node=max-wgs
 service_ip=`resolveip -s ${service_node}`
 discovery_port=5006
 receiver_port=4201
+beamtime_id=asapo_test
+
 
 monitor_node=zitpcx27016
 monitor_port=8086
@@ -36,11 +39,15 @@ ssh ${monitor_node} influx -execute \"create database db_test\"
 #ssh ${monitor_node} docker run -d -p 8086 -p 8086 --name influxdb influxdb
 
 ssh ${service_node} mkdir -p ${service_dir}
-ssh ${service_node} mkdir -p ${service_dir}/files
+ssh ${service_node} mkdir -p ${service_dir}/files/${beamtime_id}
 ssh ${worker_node} mkdir -p ${worker_dir}
 
 scp ../../../cmake-build-release/receiver/receiver ${service_node}:${service_dir}
 scp ../../../cmake-build-release/discovery/asapo-discovery ${service_node}:${service_dir}
+
+scp ../../../cmake-build-release/authorizer/asapo-authorizer ${service_node}:${service_dir}
+scp authorizer.json ${service_node}:${service_dir}/authorizer.json
+
 scp ../../../cmake-build-release/examples/producer/dummy-data-producer/dummy-data-producer ${worker_node}:${worker_dir}
 
 function do_work {
@@ -73,7 +80,10 @@ cat discovery_tmp.json | jq ".Receiver.StaticEndpoints = [\"${service_node}:${re
 
 scp discovery_tmp1.json ${service_node}:${service_dir}/discovery.json
 scp receiver_tmp.json ${service_node}:${service_dir}/receiver.json
+
+
 rm discovery_tmp*.json receiver_tmp.json
+ssh ${service_node} "bash -c 'cd ${service_dir}; nohup ./asapo-authorizer -config authorizer.json &> ${service_dir}/authorizer.log &'"
 ssh ${service_node} "bash -c 'cd ${service_dir}; nohup ./receiver receiver.json &> ${service_dir}/receiver.log &'"
 ssh ${service_node} "bash -c 'cd ${service_dir}; nohup ./asapo-discovery -config discovery.json &> ${service_dir}/discovery.log &'"
 
@@ -82,15 +92,16 @@ for size  in 100 1000 10000
 do
 ssh ${service_node} docker run -d -p 27017:27017 --name mongo mongo
 echo ===================================================================
-ssh ${worker_node} ${worker_dir}/dummy-data-producer ${service_ip}:8400 ${size} 1000 8 0
+ssh ${worker_node} ${worker_dir}/dummy-data-producer ${service_ip}:8400 ${beamtime_id} ${size} 1000 8 0 100
 if [ "$1" == "true" ]
 then
-    ssh ${service_node} rm -f ${service_dir}/files/*
+    ssh ${service_node} rm -f ${service_dir}/files/${beamtime_id}/*
 fi
 ssh ${service_node} docker rm -f -v mongo
 done
 ssh ${service_node} killall receiver
 ssh ${service_node} killall asapo-discovery
+ssh ${service_node} killall asapo-authorizer
 }
 
 echo