84 files changed, 81 insertions, 27 deletions

diff --git a/plugins/jobs/doc/jobs_arch.drawio b/plugins/jobs/doc/jobs_arch.drawio
index a8e3778f..871df916 100644
--- a/plugins/jobs/doc/jobs_arch.drawio
+++ b/plugins/jobs/doc/jobs_arch.drawio
@@ -1 +1 @@
-<mxfile host="Electron" modified="2021-06-15T11:53:27.842Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.9 Safari/537.36" etag="FDJoAwnkRul0Vyh6IqdT" version="14.6.13" type="device"><diagram id="AFQlLRRq6yGg9IpTzkrs" name="Page-1">ddHBEoIgEADQr+FOoM10NquLJw+dGdmEGXQdpNH6+nTAjKwTy9tdYBbCs2Y8W9GpAiUYwqgcCT8SxnZJsp+WWR5eDmnqobZahqIVSv2EgDToXUvoo0KHaJzuYqywbaFykQlrcYjLbmjiWztRwwbKSpitXrV0yiujlK6JC+haue9MI5bqAL0SEocP4jnhmUV0PmrGDMw8vWUwvu/0J/t+mYXW/WiYgvXsaRN9Ec9f</diagram></mxfile>
\ No newline at end of file
+<mxfile host="Electron" modified="2021-06-16T08:42:30.343Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.9 Safari/537.36" etag="TfWMGqp6GgpLWRWY4Wkn" version="14.6.13" type="device"><diagram id="AFQlLRRq6yGg9IpTzkrs" name="Page-1">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</diagram></mxfile>
\ No newline at end of file
diff --git a/plugins/jobs/broker.go b/plugins/jobs/oooold/broker.go
index 0066a4f1..d49616e7 100644
--- a/plugins/jobs/broker.go
+++ b/plugins/jobs/oooold/broker.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 // Broker manages set of pipelines and provides ability to push jobs into them.
 type Broker interface {
diff --git a/plugins/jobs/broker/amqp/broker.go b/plugins/jobs/oooold/broker/amqp/broker.go
index b47d83ee..b47d83ee 100644
--- a/plugins/jobs/broker/amqp/broker.go
+++ b/plugins/jobs/oooold/broker/amqp/broker.go
diff --git a/plugins/jobs/broker/amqp/broker_test.go b/plugins/jobs/oooold/broker/amqp/broker_test.go
index 66078099..66078099 100644
--- a/plugins/jobs/broker/amqp/broker_test.go
+++ b/plugins/jobs/oooold/broker/amqp/broker_test.go
diff --git a/plugins/jobs/broker/amqp/config.go b/plugins/jobs/oooold/broker/amqp/config.go
index 0ed3a50e..0ed3a50e 100644
--- a/plugins/jobs/broker/amqp/config.go
+++ b/plugins/jobs/oooold/broker/amqp/config.go
diff --git a/plugins/jobs/broker/amqp/config_test.go b/plugins/jobs/oooold/broker/amqp/config_test.go
index 1abbb55d..1abbb55d 100644
--- a/plugins/jobs/broker/amqp/config_test.go
+++ b/plugins/jobs/oooold/broker/amqp/config_test.go
diff --git a/plugins/jobs/broker/amqp/conn.go b/plugins/jobs/oooold/broker/amqp/conn.go
index be747776..be747776 100644
--- a/plugins/jobs/broker/amqp/conn.go
+++ b/plugins/jobs/oooold/broker/amqp/conn.go
diff --git a/plugins/jobs/broker/amqp/consume_test.go b/plugins/jobs/oooold/broker/amqp/consume_test.go
index 28999c36..28999c36 100644
--- a/plugins/jobs/broker/amqp/consume_test.go
+++ b/plugins/jobs/oooold/broker/amqp/consume_test.go
diff --git a/plugins/jobs/broker/amqp/durability_test.go b/plugins/jobs/oooold/broker/amqp/durability_test.go
index 00d62c51..00d62c51 100644
--- a/plugins/jobs/broker/amqp/durability_test.go
+++ b/plugins/jobs/oooold/broker/amqp/durability_test.go
diff --git a/plugins/jobs/broker/amqp/job.go b/plugins/jobs/oooold/broker/amqp/job.go
index bd559715..bd559715 100644
--- a/plugins/jobs/broker/amqp/job.go
+++ b/plugins/jobs/oooold/broker/amqp/job.go
diff --git a/plugins/jobs/broker/amqp/job_test.go b/plugins/jobs/oooold/broker/amqp/job_test.go
index 24ca453b..24ca453b 100644
--- a/plugins/jobs/broker/amqp/job_test.go
+++ b/plugins/jobs/oooold/broker/amqp/job_test.go
diff --git a/plugins/jobs/broker/amqp/queue.go b/plugins/jobs/oooold/broker/amqp/queue.go
index 6ef5f20f..6ef5f20f 100644
--- a/plugins/jobs/broker/amqp/queue.go
+++ b/plugins/jobs/oooold/broker/amqp/queue.go
diff --git a/plugins/jobs/broker/amqp/stat_test.go b/plugins/jobs/oooold/broker/amqp/stat_test.go
index ef19746c..ef19746c 100644
--- a/plugins/jobs/broker/amqp/stat_test.go
+++ b/plugins/jobs/oooold/broker/amqp/stat_test.go
diff --git a/plugins/jobs/broker/beanstalk/broker.go b/plugins/jobs/oooold/broker/beanstalk/broker.go
index dc3ea518..dc3ea518 100644
--- a/plugins/jobs/broker/beanstalk/broker.go
+++ b/plugins/jobs/oooold/broker/beanstalk/broker.go
diff --git a/plugins/jobs/broker/beanstalk/broker_test.go b/plugins/jobs/oooold/broker/beanstalk/broker_test.go
index cd2132af..cd2132af 100644
--- a/plugins/jobs/broker/beanstalk/broker_test.go
+++ b/plugins/jobs/oooold/broker/beanstalk/broker_test.go
diff --git a/plugins/jobs/broker/beanstalk/config.go b/plugins/jobs/oooold/broker/beanstalk/config.go
index 3e48a2d7..3e48a2d7 100644
--- a/plugins/jobs/broker/beanstalk/config.go
+++ b/plugins/jobs/oooold/broker/beanstalk/config.go
diff --git a/plugins/jobs/broker/beanstalk/config_test.go b/plugins/jobs/oooold/broker/beanstalk/config_test.go
index 4ba08a04..4ba08a04 100644
--- a/plugins/jobs/broker/beanstalk/config_test.go
+++ b/plugins/jobs/oooold/broker/beanstalk/config_test.go
diff --git a/plugins/jobs/broker/beanstalk/conn.go b/plugins/jobs/oooold/broker/beanstalk/conn.go
index 7aba6bbb..7aba6bbb 100644
--- a/plugins/jobs/broker/beanstalk/conn.go
+++ b/plugins/jobs/oooold/broker/beanstalk/conn.go
diff --git a/plugins/jobs/broker/beanstalk/constants.go b/plugins/jobs/oooold/broker/beanstalk/constants.go
index 84be305e..84be305e 100644
--- a/plugins/jobs/broker/beanstalk/constants.go
+++ b/plugins/jobs/oooold/broker/beanstalk/constants.go
diff --git a/plugins/jobs/broker/beanstalk/consume_test.go b/plugins/jobs/oooold/broker/beanstalk/consume_test.go
index b16866ae..b16866ae 100644
--- a/plugins/jobs/broker/beanstalk/consume_test.go
+++ b/plugins/jobs/oooold/broker/beanstalk/consume_test.go
diff --git a/plugins/jobs/broker/beanstalk/durability_test.go b/plugins/jobs/oooold/broker/beanstalk/durability_test.go
index 499a5206..499a5206 100644
--- a/plugins/jobs/broker/beanstalk/durability_test.go
+++ b/plugins/jobs/oooold/broker/beanstalk/durability_test.go
diff --git a/plugins/jobs/broker/beanstalk/job.go b/plugins/jobs/oooold/broker/beanstalk/job.go
index fd9c8c3c..fd9c8c3c 100644
--- a/plugins/jobs/broker/beanstalk/job.go
+++ b/plugins/jobs/oooold/broker/beanstalk/job.go
diff --git a/plugins/jobs/broker/beanstalk/sock.bean b/plugins/jobs/oooold/broker/beanstalk/sock.bean
index e69de29b..e69de29b 100644
--- a/plugins/jobs/broker/beanstalk/sock.bean
+++ b/plugins/jobs/oooold/broker/beanstalk/sock.bean
diff --git a/plugins/jobs/broker/beanstalk/stat_test.go b/plugins/jobs/oooold/broker/beanstalk/stat_test.go
index 14a55859..14a55859 100644
--- a/plugins/jobs/broker/beanstalk/stat_test.go
+++ b/plugins/jobs/oooold/broker/beanstalk/stat_test.go
diff --git a/plugins/jobs/broker/beanstalk/tube.go b/plugins/jobs/oooold/broker/beanstalk/tube.go
index 9d7ad117..9d7ad117 100644
--- a/plugins/jobs/broker/beanstalk/tube.go
+++ b/plugins/jobs/oooold/broker/beanstalk/tube.go
diff --git a/plugins/jobs/broker/beanstalk/tube_test.go b/plugins/jobs/oooold/broker/beanstalk/tube_test.go
index b6a646f4..b6a646f4 100644
--- a/plugins/jobs/broker/beanstalk/tube_test.go
+++ b/plugins/jobs/oooold/broker/beanstalk/tube_test.go
diff --git a/plugins/jobs/broker/ephemeral/broker.go b/plugins/jobs/oooold/broker/ephemeral/broker.go
index 385bb175..385bb175 100644
--- a/plugins/jobs/broker/ephemeral/broker.go
+++ b/plugins/jobs/oooold/broker/ephemeral/broker.go
diff --git a/plugins/jobs/broker/ephemeral/broker_test.go b/plugins/jobs/oooold/broker/ephemeral/broker_test.go
index c1b40276..c1b40276 100644
--- a/plugins/jobs/broker/ephemeral/broker_test.go
+++ b/plugins/jobs/oooold/broker/ephemeral/broker_test.go
diff --git a/plugins/jobs/broker/ephemeral/consume_test.go b/plugins/jobs/oooold/broker/ephemeral/consume_test.go
index d764a984..d764a984 100644
--- a/plugins/jobs/broker/ephemeral/consume_test.go
+++ b/plugins/jobs/oooold/broker/ephemeral/consume_test.go
diff --git a/plugins/jobs/broker/ephemeral/queue.go b/plugins/jobs/oooold/broker/ephemeral/queue.go
index a24bc216..a24bc216 100644
--- a/plugins/jobs/broker/ephemeral/queue.go
+++ b/plugins/jobs/oooold/broker/ephemeral/queue.go
diff --git a/plugins/jobs/broker/ephemeral/stat_test.go b/plugins/jobs/oooold/broker/ephemeral/stat_test.go
index 0894323c..0894323c 100644
--- a/plugins/jobs/broker/ephemeral/stat_test.go
+++ b/plugins/jobs/oooold/broker/ephemeral/stat_test.go
diff --git a/plugins/jobs/broker/sqs/broker.go b/plugins/jobs/oooold/broker/sqs/broker.go
index 8cc62b6b..8cc62b6b 100644
--- a/plugins/jobs/broker/sqs/broker.go
+++ b/plugins/jobs/oooold/broker/sqs/broker.go
diff --git a/plugins/jobs/broker/sqs/broker_test.go b/plugins/jobs/oooold/broker/sqs/broker_test.go
index c87b302d..c87b302d 100644
--- a/plugins/jobs/broker/sqs/broker_test.go
+++ b/plugins/jobs/oooold/broker/sqs/broker_test.go
diff --git a/plugins/jobs/broker/sqs/config.go b/plugins/jobs/oooold/broker/sqs/config.go
index d0c2f2b2..d0c2f2b2 100644
--- a/plugins/jobs/broker/sqs/config.go
+++ b/plugins/jobs/oooold/broker/sqs/config.go
diff --git a/plugins/jobs/broker/sqs/config_test.go b/plugins/jobs/oooold/broker/sqs/config_test.go
index b36b3c6f..b36b3c6f 100644
--- a/plugins/jobs/broker/sqs/config_test.go
+++ b/plugins/jobs/oooold/broker/sqs/config_test.go
diff --git a/plugins/jobs/broker/sqs/consume_test.go b/plugins/jobs/oooold/broker/sqs/consume_test.go
index 434fc6ea..434fc6ea 100644
--- a/plugins/jobs/broker/sqs/consume_test.go
+++ b/plugins/jobs/oooold/broker/sqs/consume_test.go
diff --git a/plugins/jobs/broker/sqs/durability_test.go b/plugins/jobs/oooold/broker/sqs/durability_test.go
index 58ddf4b9..58ddf4b9 100644
--- a/plugins/jobs/broker/sqs/durability_test.go
+++ b/plugins/jobs/oooold/broker/sqs/durability_test.go
diff --git a/plugins/jobs/broker/sqs/job.go b/plugins/jobs/oooold/broker/sqs/job.go
index 50e2c164..50e2c164 100644
--- a/plugins/jobs/broker/sqs/job.go
+++ b/plugins/jobs/oooold/broker/sqs/job.go
diff --git a/plugins/jobs/broker/sqs/job_test.go b/plugins/jobs/oooold/broker/sqs/job_test.go
index a120af53..a120af53 100644
--- a/plugins/jobs/broker/sqs/job_test.go
+++ b/plugins/jobs/oooold/broker/sqs/job_test.go
diff --git a/plugins/jobs/broker/sqs/queue.go b/plugins/jobs/oooold/broker/sqs/queue.go
index 8a92448e..8a92448e 100644
--- a/plugins/jobs/broker/sqs/queue.go
+++ b/plugins/jobs/oooold/broker/sqs/queue.go
diff --git a/plugins/jobs/broker/sqs/stat_test.go b/plugins/jobs/oooold/broker/sqs/stat_test.go
index 5031571b..5031571b 100644
--- a/plugins/jobs/broker/sqs/stat_test.go
+++ b/plugins/jobs/oooold/broker/sqs/stat_test.go
diff --git a/plugins/jobs/broker_test.go b/plugins/jobs/oooold/broker_test.go
index 9625e24b..b93eac51 100644
--- a/plugins/jobs/broker_test.go
+++ b/plugins/jobs/oooold/broker_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"fmt"
diff --git a/plugins/jobs/config.go b/plugins/jobs/oooold/config.go
index 674bf468..cf40b6fb 100644
--- a/plugins/jobs/config.go
+++ b/plugins/jobs/oooold/config.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"fmt"
diff --git a/plugins/jobs/config_test.go b/plugins/jobs/oooold/config_test.go
index c55a5c5f..5f14eb32 100644
--- a/plugins/jobs/config_test.go
+++ b/plugins/jobs/oooold/config_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	json "github.com/json-iterator/go"
diff --git a/plugins/jobs/dispatcher.go b/plugins/jobs/oooold/dispatcher.go
index 9fde8fac..801e1973 100644
--- a/plugins/jobs/dispatcher.go
+++ b/plugins/jobs/oooold/dispatcher.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"strings"
diff --git a/plugins/jobs/dispatcher_test.go b/plugins/jobs/oooold/dispatcher_test.go
index 59e3fd4e..92f8c956 100644
--- a/plugins/jobs/dispatcher_test.go
+++ b/plugins/jobs/oooold/dispatcher_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"github.com/stretchr/testify/assert"
diff --git a/plugins/jobs/event.go b/plugins/jobs/oooold/event.go
index 68dd34e5..6524712f 100644
--- a/plugins/jobs/event.go
+++ b/plugins/jobs/oooold/event.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import "time"
 
diff --git a/plugins/jobs/event_test.go b/plugins/jobs/oooold/event_test.go
index 94d53531..82241124 100644
--- a/plugins/jobs/event_test.go
+++ b/plugins/jobs/oooold/event_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"errors"
diff --git a/plugins/jobs/job.go b/plugins/jobs/oooold/job.go
index b747fcfd..2f80c1cc 100644
--- a/plugins/jobs/job.go
+++ b/plugins/jobs/oooold/job.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import json "github.com/json-iterator/go"
 
diff --git a/plugins/jobs/job_options.go b/plugins/jobs/oooold/job_options.go
index d4c6f0d2..206bbfc4 100644
--- a/plugins/jobs/job_options.go
+++ b/plugins/jobs/oooold/job_options.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import "time"
 
diff --git a/plugins/jobs/job_options_test.go b/plugins/jobs/oooold/job_options_test.go
index 8caaa935..4575d959 100644
--- a/plugins/jobs/job_options_test.go
+++ b/plugins/jobs/oooold/job_options_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"github.com/stretchr/testify/assert"
diff --git a/plugins/jobs/job_test.go b/plugins/jobs/oooold/job_test.go
index e1938eca..5db924eb 100644
--- a/plugins/jobs/job_test.go
+++ b/plugins/jobs/oooold/job_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"github.com/stretchr/testify/assert"
diff --git a/plugins/jobs/pipeline.go b/plugins/jobs/oooold/pipeline.go
index 58b76e33..c533f23d 100644
--- a/plugins/jobs/pipeline.go
+++ b/plugins/jobs/oooold/pipeline.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"fmt"
@@ -87,7 +87,7 @@ func (p Pipeline) With(name string, value interface{}) Pipeline {
 	}
 	out[name] = value
 
-	return Pipeline(out)
+	return out
 }
 
 // Name returns pipeline name.
@@ -121,7 +121,7 @@ func (p Pipeline) Map(name string) Pipeline {
 		}
 	}
 
-	return Pipeline(out)
+	return out
 }
 
 // Bool must return option value as string or return default value.
diff --git a/plugins/jobs/pipeline_test.go b/plugins/jobs/oooold/pipeline_test.go
index b80e75d0..0ace029f 100644
--- a/plugins/jobs/pipeline_test.go
+++ b/plugins/jobs/oooold/pipeline_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"github.com/stretchr/testify/assert"
diff --git a/plugins/jobs/rpc.go b/plugins/jobs/oooold/rpc.go
index cc1ecd99..42730a68 100644
--- a/plugins/jobs/rpc.go
+++ b/plugins/jobs/oooold/rpc.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"fmt"
diff --git a/plugins/jobs/rpc_test.go b/plugins/jobs/oooold/rpc_test.go
index c70ef86f..a63b9ea2 100644
--- a/plugins/jobs/rpc_test.go
+++ b/plugins/jobs/oooold/rpc_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"github.com/sirupsen/logrus"
diff --git a/plugins/jobs/service.go b/plugins/jobs/oooold/service.go
index bb7ce09c..4244ed1a 100644
--- a/plugins/jobs/service.go
+++ b/plugins/jobs/oooold/service.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"fmt"
diff --git a/plugins/jobs/service_test.go b/plugins/jobs/oooold/service_test.go
index 74781525..a8e0e56d 100644
--- a/plugins/jobs/service_test.go
+++ b/plugins/jobs/oooold/service_test.go
@@ -1,4 +1,4 @@
-package jobs
+package oooold
 
 import (
 	"bytes"
diff --git a/plugins/jobs/tests/.rr.yaml b/plugins/jobs/oooold/tests/.rr.yaml
index 2fd323db..2fd323db 100644
--- a/plugins/jobs/tests/.rr.yaml
+++ b/plugins/jobs/oooold/tests/.rr.yaml
diff --git a/plugins/jobs/tests/Jobs/Amqp/BrokerTest.php b/plugins/jobs/oooold/tests/Jobs/Amqp/BrokerTest.php
index 637c14d6..637c14d6 100644
--- a/plugins/jobs/tests/Jobs/Amqp/BrokerTest.php
+++ b/plugins/jobs/oooold/tests/Jobs/Amqp/BrokerTest.php
diff --git a/plugins/jobs/tests/Jobs/Amqp/ErrorJob.php b/plugins/jobs/oooold/tests/Jobs/Amqp/ErrorJob.php
index 82b6e7e0..82b6e7e0 100644
--- a/plugins/jobs/tests/Jobs/Amqp/ErrorJob.php
+++ b/plugins/jobs/oooold/tests/Jobs/Amqp/ErrorJob.php
diff --git a/plugins/jobs/tests/Jobs/Amqp/Job.php b/plugins/jobs/oooold/tests/Jobs/Amqp/Job.php
index 2c6ad819..2c6ad819 100644
--- a/plugins/jobs/tests/Jobs/Amqp/Job.php
+++ b/plugins/jobs/oooold/tests/Jobs/Amqp/Job.php
diff --git a/plugins/jobs/tests/Jobs/BaseTest.php b/plugins/jobs/oooold/tests/Jobs/BaseTest.php
index 67f280b5..67f280b5 100644
--- a/plugins/jobs/tests/Jobs/BaseTest.php
+++ b/plugins/jobs/oooold/tests/Jobs/BaseTest.php
diff --git a/plugins/jobs/tests/Jobs/Beanstalk/BrokerTest.php b/plugins/jobs/oooold/tests/Jobs/Beanstalk/BrokerTest.php
index d1ea4682..d1ea4682 100644
--- a/plugins/jobs/tests/Jobs/Beanstalk/BrokerTest.php
+++ b/plugins/jobs/oooold/tests/Jobs/Beanstalk/BrokerTest.php
diff --git a/plugins/jobs/tests/Jobs/Beanstalk/ErrorJob.php b/plugins/jobs/oooold/tests/Jobs/Beanstalk/ErrorJob.php
index c4349871..c4349871 100644
--- a/plugins/jobs/tests/Jobs/Beanstalk/ErrorJob.php
+++ b/plugins/jobs/oooold/tests/Jobs/Beanstalk/ErrorJob.php
diff --git a/plugins/jobs/tests/Jobs/Beanstalk/Job.php b/plugins/jobs/oooold/tests/Jobs/Beanstalk/Job.php
index f8bd541a..f8bd541a 100644
--- a/plugins/jobs/tests/Jobs/Beanstalk/Job.php
+++ b/plugins/jobs/oooold/tests/Jobs/Beanstalk/Job.php
diff --git a/plugins/jobs/tests/Jobs/Local/BrokerTest.php b/plugins/jobs/oooold/tests/Jobs/Local/BrokerTest.php
index 9ba83de6..9ba83de6 100644
--- a/plugins/jobs/tests/Jobs/Local/BrokerTest.php
+++ b/plugins/jobs/oooold/tests/Jobs/Local/BrokerTest.php
diff --git a/plugins/jobs/tests/Jobs/Local/ErrorJob.php b/plugins/jobs/oooold/tests/Jobs/Local/ErrorJob.php
index 70b1365b..70b1365b 100644
--- a/plugins/jobs/tests/Jobs/Local/ErrorJob.php
+++ b/plugins/jobs/oooold/tests/Jobs/Local/ErrorJob.php
diff --git a/plugins/jobs/tests/Jobs/Local/Job.php b/plugins/jobs/oooold/tests/Jobs/Local/Job.php
index 2f5803c8..2f5803c8 100644
--- a/plugins/jobs/tests/Jobs/Local/Job.php
+++ b/plugins/jobs/oooold/tests/Jobs/Local/Job.php
diff --git a/plugins/jobs/tests/Jobs/OptionsTest.php b/plugins/jobs/oooold/tests/Jobs/OptionsTest.php
index 5d00794e..5d00794e 100644
--- a/plugins/jobs/tests/Jobs/OptionsTest.php
+++ b/plugins/jobs/oooold/tests/Jobs/OptionsTest.php
diff --git a/plugins/jobs/tests/Jobs/RegistryTest.php b/plugins/jobs/oooold/tests/Jobs/RegistryTest.php
index 7abd75f7..7abd75f7 100644
--- a/plugins/jobs/tests/Jobs/RegistryTest.php
+++ b/plugins/jobs/oooold/tests/Jobs/RegistryTest.php
diff --git a/plugins/jobs/tests/Jobs/ShortCircuitTest.php b/plugins/jobs/oooold/tests/Jobs/ShortCircuitTest.php
index c3306385..c3306385 100644
--- a/plugins/jobs/tests/Jobs/ShortCircuitTest.php
+++ b/plugins/jobs/oooold/tests/Jobs/ShortCircuitTest.php
diff --git a/plugins/jobs/tests/Jobs/Sqs/BrokerTest.php b/plugins/jobs/oooold/tests/Jobs/Sqs/BrokerTest.php
index ccaa96de..ccaa96de 100644
--- a/plugins/jobs/tests/Jobs/Sqs/BrokerTest.php
+++ b/plugins/jobs/oooold/tests/Jobs/Sqs/BrokerTest.php
diff --git a/plugins/jobs/tests/Jobs/Sqs/ErrorJob.php b/plugins/jobs/oooold/tests/Jobs/Sqs/ErrorJob.php
index 738b9f2b..738b9f2b 100644
--- a/plugins/jobs/tests/Jobs/Sqs/ErrorJob.php
+++ b/plugins/jobs/oooold/tests/Jobs/Sqs/ErrorJob.php
diff --git a/plugins/jobs/tests/Jobs/Sqs/Job.php b/plugins/jobs/oooold/tests/Jobs/Sqs/Job.php
index e22483a8..e22483a8 100644
--- a/plugins/jobs/tests/Jobs/Sqs/Job.php
+++ b/plugins/jobs/oooold/tests/Jobs/Sqs/Job.php
diff --git a/plugins/jobs/tests/bootstrap.php b/plugins/jobs/oooold/tests/bootstrap.php
index b25fdc9d..b25fdc9d 100644
--- a/plugins/jobs/tests/bootstrap.php
+++ b/plugins/jobs/oooold/tests/bootstrap.php
diff --git a/plugins/jobs/tests/consumer.php b/plugins/jobs/oooold/tests/consumer.php
index ed56edff..ed56edff 100644
--- a/plugins/jobs/tests/consumer.php
+++ b/plugins/jobs/oooold/tests/consumer.php
diff --git a/plugins/jobs/tests/docker-compose.yml b/plugins/jobs/oooold/tests/docker-compose.yml
index 7b88c9cf..7b88c9cf 100644
--- a/plugins/jobs/tests/docker-compose.yml
+++ b/plugins/jobs/oooold/tests/docker-compose.yml
diff --git a/plugins/jobs/plugin.go b/plugins/jobs/plugin.go
new file mode 100644
index 00000000..e708d0ca
--- /dev/null
+++ b/plugins/jobs/plugin.go
@@ -0,0 +1,36 @@
+package jobs
+
+import (
+	"github.com/spiral/errors"
+	"github.com/spiral/roadrunner/v2/plugins/config"
+	"github.com/spiral/roadrunner/v2/plugins/logger"
+)
+
+const (
+	PluginName string = "jobs"
+)
+
+type Plugin struct {
+}
+
+func (p *Plugin) Init(cfg config.Configurer, log logger.Logger) error {
+	const op = errors.Op("jobs_plugin_init")
+
+	return nil
+}
+
+func (p *Plugin) Serve() chan error {
+	errCh := make(chan error, 1)
+
+	return errCh
+}
+
+func (p *Plugin) Stop() error {
+	return nil
+}
+
+func (p *Plugin) Available() {}
+
+func (p *Plugin) Name() string {
+	return PluginName
+}
diff --git a/plugins/websockets/plugin.go b/plugins/websockets/plugin.go
index 6dfe6ca3..a1002bdd 100644
--- a/plugins/websockets/plugin.go
+++ b/plugins/websockets/plugin.go
@@ -82,6 +82,13 @@ func (p *Plugin) Init(cfg config.Configurer, log logger.Logger, server server.Se
 		HandshakeTimeout: time.Second * 60,
 		ReadBufferSize:   1024,
 		WriteBufferSize:  1024,
+		WriteBufferPool:  nil,
+		Subprotocols:     nil,
+		Error:            nil,
+		CheckOrigin: func(r *http.Request) bool {
+			return true
+		},
+		EnableCompression: false,
 	}
 	p.serveExit = make(chan struct{})
 	p.server = server
diff --git a/tests/composer.json b/tests/composer.json
index 50178d1f..fa5925b7 100644
--- a/tests/composer.json
+++ b/tests/composer.json
@@ -2,7 +2,7 @@
     "minimum-stability": "beta",
     "prefer-stable": true,
     "require": {
-        "nyholm/psr7": "^1.3",
+        "nyholm/psr7": "^1.4",
         "spiral/roadrunner": "^2.0",
         "spiral/roadrunner-http": "^2.0",
         "temporal/sdk": ">=1.0",
diff --git a/tests/plugins/headers/configs/.rr-cors-headers.yaml b/tests/plugins/headers/configs/.rr-cors-headers.yaml
index 9d2ef7e5..b4e960f1 100644
--- a/tests/plugins/headers/configs/.rr-cors-headers.yaml
+++ b/tests/plugins/headers/configs/.rr-cors-headers.yaml
@@ -1,9 +1,5 @@
 server:
   command: "php ../../http/client.php headers pipes"
-  user: ""
-  group: ""
-  env:
-    "RR_HTTP": "true"
   relay: "pipes"
   relay_timeout: "20s"
 
diff --git a/tests/psr-worker-bench.php b/tests/psr-worker-bench.php
index d0c72eae..b4a028d4 100644
--- a/tests/psr-worker-bench.php
+++ b/tests/psr-worker-bench.php
@@ -56,4 +56,4 @@ if ($env->getMode() === 'http') {
     }
 
     $factory->run();
-}
\ No newline at end of file
+}
diff --git a/tests/worker-cors.php b/tests/worker-cors.php
new file mode 100644
index 00000000..ea3c986c
--- /dev/null
+++ b/tests/worker-cors.php
@@ -0,0 +1,15 @@
+<?php
+
+use Spiral\RoadRunner\Worker;
+use Spiral\RoadRunner\Http\HttpWorker;
+
+ini_set('display_errors', 'stderr');
+require __DIR__ . '/vendor/autoload.php';
+
+$http = new HttpWorker(Worker::create());
+
+while ($req = $http->waitRequest()) {
+    $http->respond(200, 'Response', [
+        'Access-Control-Allow-Origin' => ['*']
+    ]);
+}