diff --git a/main_test.go b/main_test.go
index face2e64..e2ca5b14 100644
--- a/main_test.go
+++ b/main_test.go
@@ -691,333 +691,6 @@ func TestRTSPPath(t *testing.T) {
 	}
 }
 
-func TestRTMPPublish(t *testing.T) {
-	p, ok := testProgram("rtmpEnable: yes\n")
-	require.Equal(t, true, ok)
-	defer p.close()
-
-	cnt1, err := newContainer("ffmpeg", "source", []string{
-		"-re",
-		"-stream_loop", "-1",
-		"-i", "emptyvideo.ts",
-		"-c", "copy",
-		"-f", "flv",
-		"rtmp://" + ownDockerIP + ":1935/test1/test2",
-	})
-	require.NoError(t, err)
-	defer cnt1.close()
-
-	time.Sleep(1 * time.Second)
-
-	cnt2, err := newContainer("ffmpeg", "dest", []string{
-		"-rtsp_transport", "udp",
-		"-i", "rtsp://" + ownDockerIP + ":8554/test1/test2",
-		"-vframes", "1",
-		"-f", "image2",
-		"-y", "/dev/null",
-	})
-	require.NoError(t, err)
-	defer cnt2.close()
-	require.Equal(t, 0, cnt2.wait())
-}
-
-func TestRTMPRead(t *testing.T) {
-	p, ok := testProgram("rtmpEnable: yes\n")
-	require.Equal(t, true, ok)
-	defer p.close()
-
-	cnt1, err := newContainer("ffmpeg", "source", []string{
-		"-re",
-		"-stream_loop", "-1",
-		"-i", "emptyvideo.ts",
-		"-c", "copy",
-		"-f", "rtsp",
-		"rtsp://" + ownDockerIP + ":8554/teststream",
-	})
-	require.NoError(t, err)
-	defer cnt1.close()
-
-	time.Sleep(1 * time.Second)
-
-	cnt2, err := newContainer("ffmpeg", "dest", []string{
-		"-i", "rtmp://" + ownDockerIP + ":1935/teststream",
-		"-vframes", "1",
-		"-f", "image2",
-		"-y", "/dev/null",
-	})
-	require.NoError(t, err)
-	defer cnt2.close()
-	require.Equal(t, 0, cnt2.wait())
-}
-
-func TestRTMPAuth(t *testing.T) {
-	t.Run("publish", func(t *testing.T) {
-		p, ok := testProgram("rtmpEnable: yes\n" +
-			"paths:\n" +
-			"  all:\n" +
-			"    publishUser: testuser\n" +
-			"    publishPass: testpass\n")
-		require.Equal(t, true, ok)
-		defer p.close()
-
-		cnt1, err := newContainer("ffmpeg", "source", []string{
-			"-re",
-			"-stream_loop", "-1",
-			"-i", "emptyvideo.ts",
-			"-c", "copy",
-			"-f", "flv",
-			"rtmp://" + ownDockerIP + "/teststream?user=testuser&pass=testpass",
-		})
-		require.NoError(t, err)
-		defer cnt1.close()
-
-		time.Sleep(1 * time.Second)
-
-		cnt2, err := newContainer("ffmpeg", "dest", []string{
-			"-i", "rtmp://" + ownDockerIP + "/teststream",
-			"-vframes", "1",
-			"-f", "image2",
-			"-y", "/dev/null",
-		})
-		require.NoError(t, err)
-		defer cnt2.close()
-		require.Equal(t, 0, cnt2.wait())
-	})
-
-	t.Run("read", func(t *testing.T) {
-		p, ok := testProgram("rtmpEnable: yes\n" +
-			"paths:\n" +
-			"  all:\n" +
-			"    readUser: testuser\n" +
-			"    readPass: testpass\n")
-		require.Equal(t, true, ok)
-		defer p.close()
-
-		cnt1, err := newContainer("ffmpeg", "source", []string{
-			"-re",
-			"-stream_loop", "-1",
-			"-i", "emptyvideo.ts",
-			"-c", "copy",
-			"-f", "flv",
-			"rtmp://" + ownDockerIP + "/teststream",
-		})
-		require.NoError(t, err)
-		defer cnt1.close()
-
-		time.Sleep(1 * time.Second)
-
-		cnt2, err := newContainer("ffmpeg", "dest", []string{
-			"-i", "rtmp://" + ownDockerIP + "/teststream?user=testuser&pass=testpass",
-			"-vframes", "1",
-			"-f", "image2",
-			"-y", "/dev/null",
-		})
-		require.NoError(t, err)
-		defer cnt2.close()
-		require.Equal(t, 0, cnt2.wait())
-	})
-}
-
-func TestRTMPAuthFail(t *testing.T) {
-	t.Run("publish", func(t *testing.T) {
-		p, ok := testProgram("rtmpEnable: yes\n" +
-			"paths:\n" +
-			"  all:\n" +
-			"    publishUser: testuser2\n" +
-			"    publishPass: testpass\n")
-		require.Equal(t, true, ok)
-		defer p.close()
-
-		cnt1, err := newContainer("ffmpeg", "source", []string{
-			"-re",
-			"-stream_loop", "-1",
-			"-i", "emptyvideo.ts",
-			"-c", "copy",
-			"-f", "flv",
-			"rtmp://" + ownDockerIP + "/teststream?user=testuser&pass=testpass",
-		})
-		require.NoError(t, err)
-		defer cnt1.close()
-
-		time.Sleep(1 * time.Second)
-
-		cnt2, err := newContainer("ffmpeg", "dest", []string{
-			"-i", "rtmp://" + ownDockerIP + "/teststream",
-			"-vframes", "1",
-			"-f", "image2",
-			"-y", "/dev/null",
-		})
-		require.NoError(t, err)
-		defer cnt2.close()
-		require.NotEqual(t, 0, cnt2.wait())
-	})
-
-	t.Run("read", func(t *testing.T) {
-		p, ok := testProgram("rtmpEnable: yes\n" +
-			"paths:\n" +
-			"  all:\n" +
-			"    readUser: testuser2\n" +
-			"    readPass: testpass\n")
-		require.Equal(t, true, ok)
-		defer p.close()
-
-		cnt1, err := newContainer("ffmpeg", "source", []string{
-			"-re",
-			"-stream_loop", "-1",
-			"-i", "emptyvideo.ts",
-			"-c", "copy",
-			"-f", "flv",
-			"rtmp://" + ownDockerIP + "/teststream",
-		})
-		require.NoError(t, err)
-		defer cnt1.close()
-
-		time.Sleep(1 * time.Second)
-
-		cnt2, err := newContainer("ffmpeg", "dest", []string{
-			"-i", "rtmp://" + ownDockerIP + "/teststream?user=testuser&pass=testpass",
-			"-vframes", "1",
-			"-f", "image2",
-			"-y", "/dev/null",
-		})
-		require.NoError(t, err)
-		defer cnt2.close()
-		require.NotEqual(t, 0, cnt2.wait())
-	})
-}
-
-func TestSource(t *testing.T) {
-	for _, source := range []string{
-		//"rtsp_udp",
-		//"rtsp_tcp",
-		//"rtsps",
-		//"rtmp_videoaudio",
-		"rtmp_video",
-	} {
-		t.Run(source, func(t *testing.T) {
-			switch source {
-			case "rtsp_udp", "rtsp_tcp":
-				p1, ok := testProgram("rtspPort: 8555\n" +
-					"rtpPort: 8100\n" +
-					"rtcpPort: 8101\n" +
-					"paths:\n" +
-					"  all:\n" +
-					"    readUser: testuser\n" +
-					"    readPass: testpass\n")
-				require.Equal(t, true, ok)
-				defer p1.close()
-
-				cnt1, err := newContainer("ffmpeg", "source", []string{
-					"-re",
-					"-stream_loop", "-1",
-					"-i", "emptyvideo.ts",
-					"-c", "copy",
-					"-f", "rtsp",
-					"-rtsp_transport", "udp",
-					"rtsp://" + ownDockerIP + ":8555/teststream",
-				})
-				require.NoError(t, err)
-				defer cnt1.close()
-
-				p2, ok := testProgram("paths:\n" +
-					"  proxied:\n" +
-					"    source: rtsp://testuser:testpass@localhost:8555/teststream\n" +
-					"    sourceProtocol: " + source[len("rtsp_"):] + "\n" +
-					"    sourceOnDemand: yes\n")
-				require.Equal(t, true, ok)
-				defer p2.close()
-
-			case "rtsps":
-				serverCertFpath, err := writeTempFile(serverCert)
-				require.NoError(t, err)
-				defer os.Remove(serverCertFpath)
-
-				serverKeyFpath, err := writeTempFile(serverKey)
-				require.NoError(t, err)
-				defer os.Remove(serverKeyFpath)
-
-				p, ok := testProgram("rtspPort: 8555\n" +
-					"rtpPort: 8100\n" +
-					"rtcpPort: 8101\n" +
-					"readTimeout: 20s\n" +
-					"protocols: [tcp]\n" +
-					"encryption: yes\n" +
-					"serverCert: " + serverCertFpath + "\n" +
-					"serverKey: " + serverKeyFpath + "\n" +
-					"paths:\n" +
-					"  all:\n" +
-					"    readUser: testuser\n" +
-					"    readPass: testpass\n")
-				require.Equal(t, true, ok)
-				defer p.close()
-
-				cnt1, err := newContainer("ffmpeg", "source", []string{
-					"-re",
-					"-stream_loop", "-1",
-					"-i", "emptyvideo.ts",
-					"-c", "copy",
-					"-f", "rtsp",
-					"rtsps://" + ownDockerIP + ":8555/teststream",
-				})
-				require.NoError(t, err)
-				defer cnt1.close()
-
-				time.Sleep(1 * time.Second)
-
-				p2, ok := testProgram("paths:\n" +
-					"  proxied:\n" +
-					"    source: rtsps://testuser:testpass@localhost:8555/teststream\n" +
-					"    sourceOnDemand: yes\n")
-				require.Equal(t, true, ok)
-				defer p2.close()
-
-			case "rtmp_videoaudio", "rtmp_video":
-				cnt1, err := newContainer("nginx-rtmp", "rtmpserver", []string{})
-				require.NoError(t, err)
-				defer cnt1.close()
-
-				input := "emptyvideoaudio.ts"
-				if source == "rtmp_video" {
-					input = "emptyvideo.ts"
-				}
-
-				cnt2, err := newContainer("ffmpeg", "source", []string{
-					"-re",
-					"-stream_loop", "-1",
-					"-i", input,
-					"-c", "copy",
-					"-f", "flv",
-					"rtmp://" + cnt1.ip() + "/stream/test",
-				})
-				require.NoError(t, err)
-				defer cnt2.close()
-
-				time.Sleep(1 * time.Second)
-
-				p, ok := testProgram("paths:\n" +
-					"  proxied:\n" +
-					"    source: rtmp://" + cnt1.ip() + "/stream/test\n" +
-					"    sourceOnDemand: yes\n")
-				require.Equal(t, true, ok)
-				defer p.close()
-			}
-
-			time.Sleep(1 * time.Second)
-
-			cnt3, err := newContainer("ffmpeg", "dest", []string{
-				"-rtsp_transport", "udp",
-				"-i", "rtsp://" + ownDockerIP + ":8554/proxied",
-				"-vframes", "1",
-				"-f", "image2",
-				"-y", "/dev/null",
-			})
-			require.NoError(t, err)
-			defer cnt3.close()
-			require.Equal(t, 0, cnt3.wait())
-		})
-	}
-}
-
 func TestRTSPRedirect(t *testing.T) {
 	p1, ok := testProgram("paths:\n" +
 		"  path1:\n" +
@@ -1272,6 +945,333 @@ wait
 	})
 }
 
+func TestRTMPPublish(t *testing.T) {
+	p, ok := testProgram("rtmpEnable: yes\n")
+	require.Equal(t, true, ok)
+	defer p.close()
+
+	cnt1, err := newContainer("ffmpeg", "source", []string{
+		"-re",
+		"-stream_loop", "-1",
+		"-i", "emptyvideo.ts",
+		"-c", "copy",
+		"-f", "flv",
+		"rtmp://" + ownDockerIP + ":1935/test1/test2",
+	})
+	require.NoError(t, err)
+	defer cnt1.close()
+
+	time.Sleep(1 * time.Second)
+
+	cnt2, err := newContainer("ffmpeg", "dest", []string{
+		"-rtsp_transport", "udp",
+		"-i", "rtsp://" + ownDockerIP + ":8554/test1/test2",
+		"-vframes", "1",
+		"-f", "image2",
+		"-y", "/dev/null",
+	})
+	require.NoError(t, err)
+	defer cnt2.close()
+	require.Equal(t, 0, cnt2.wait())
+}
+
+func TestRTMPRead(t *testing.T) {
+	p, ok := testProgram("rtmpEnable: yes\n")
+	require.Equal(t, true, ok)
+	defer p.close()
+
+	cnt1, err := newContainer("ffmpeg", "source", []string{
+		"-re",
+		"-stream_loop", "-1",
+		"-i", "emptyvideo.ts",
+		"-c", "copy",
+		"-f", "rtsp",
+		"rtsp://" + ownDockerIP + ":8554/teststream",
+	})
+	require.NoError(t, err)
+	defer cnt1.close()
+
+	time.Sleep(1 * time.Second)
+
+	cnt2, err := newContainer("ffmpeg", "dest", []string{
+		"-i", "rtmp://" + ownDockerIP + ":1935/teststream",
+		"-vframes", "1",
+		"-f", "image2",
+		"-y", "/dev/null",
+	})
+	require.NoError(t, err)
+	defer cnt2.close()
+	require.Equal(t, 0, cnt2.wait())
+}
+
+func TestRTMPAuth(t *testing.T) {
+	t.Run("publish", func(t *testing.T) {
+		p, ok := testProgram("rtmpEnable: yes\n" +
+			"paths:\n" +
+			"  all:\n" +
+			"    publishUser: testuser\n" +
+			"    publishPass: testpass\n")
+		require.Equal(t, true, ok)
+		defer p.close()
+
+		cnt1, err := newContainer("ffmpeg", "source", []string{
+			"-re",
+			"-stream_loop", "-1",
+			"-i", "emptyvideo.ts",
+			"-c", "copy",
+			"-f", "flv",
+			"rtmp://" + ownDockerIP + "/teststream?user=testuser&pass=testpass",
+		})
+		require.NoError(t, err)
+		defer cnt1.close()
+
+		time.Sleep(1 * time.Second)
+
+		cnt2, err := newContainer("ffmpeg", "dest", []string{
+			"-i", "rtmp://" + ownDockerIP + "/teststream",
+			"-vframes", "1",
+			"-f", "image2",
+			"-y", "/dev/null",
+		})
+		require.NoError(t, err)
+		defer cnt2.close()
+		require.Equal(t, 0, cnt2.wait())
+	})
+
+	t.Run("read", func(t *testing.T) {
+		p, ok := testProgram("rtmpEnable: yes\n" +
+			"paths:\n" +
+			"  all:\n" +
+			"    readUser: testuser\n" +
+			"    readPass: testpass\n")
+		require.Equal(t, true, ok)
+		defer p.close()
+
+		cnt1, err := newContainer("ffmpeg", "source", []string{
+			"-re",
+			"-stream_loop", "-1",
+			"-i", "emptyvideo.ts",
+			"-c", "copy",
+			"-f", "flv",
+			"rtmp://" + ownDockerIP + "/teststream",
+		})
+		require.NoError(t, err)
+		defer cnt1.close()
+
+		time.Sleep(1 * time.Second)
+
+		cnt2, err := newContainer("ffmpeg", "dest", []string{
+			"-i", "rtmp://" + ownDockerIP + "/teststream?user=testuser&pass=testpass",
+			"-vframes", "1",
+			"-f", "image2",
+			"-y", "/dev/null",
+		})
+		require.NoError(t, err)
+		defer cnt2.close()
+		require.Equal(t, 0, cnt2.wait())
+	})
+}
+
+func TestRTMPAuthFail(t *testing.T) {
+	t.Run("publish", func(t *testing.T) {
+		p, ok := testProgram("rtmpEnable: yes\n" +
+			"paths:\n" +
+			"  all:\n" +
+			"    publishUser: testuser2\n" +
+			"    publishPass: testpass\n")
+		require.Equal(t, true, ok)
+		defer p.close()
+
+		cnt1, err := newContainer("ffmpeg", "source", []string{
+			"-re",
+			"-stream_loop", "-1",
+			"-i", "emptyvideo.ts",
+			"-c", "copy",
+			"-f", "flv",
+			"rtmp://" + ownDockerIP + "/teststream?user=testuser&pass=testpass",
+		})
+		require.NoError(t, err)
+		defer cnt1.close()
+
+		time.Sleep(1 * time.Second)
+
+		cnt2, err := newContainer("ffmpeg", "dest", []string{
+			"-i", "rtmp://" + ownDockerIP + "/teststream",
+			"-vframes", "1",
+			"-f", "image2",
+			"-y", "/dev/null",
+		})
+		require.NoError(t, err)
+		defer cnt2.close()
+		require.NotEqual(t, 0, cnt2.wait())
+	})
+
+	t.Run("read", func(t *testing.T) {
+		p, ok := testProgram("rtmpEnable: yes\n" +
+			"paths:\n" +
+			"  all:\n" +
+			"    readUser: testuser2\n" +
+			"    readPass: testpass\n")
+		require.Equal(t, true, ok)
+		defer p.close()
+
+		cnt1, err := newContainer("ffmpeg", "source", []string{
+			"-re",
+			"-stream_loop", "-1",
+			"-i", "emptyvideo.ts",
+			"-c", "copy",
+			"-f", "flv",
+			"rtmp://" + ownDockerIP + "/teststream",
+		})
+		require.NoError(t, err)
+		defer cnt1.close()
+
+		time.Sleep(1 * time.Second)
+
+		cnt2, err := newContainer("ffmpeg", "dest", []string{
+			"-i", "rtmp://" + ownDockerIP + "/teststream?user=testuser&pass=testpass",
+			"-vframes", "1",
+			"-f", "image2",
+			"-y", "/dev/null",
+		})
+		require.NoError(t, err)
+		defer cnt2.close()
+		require.NotEqual(t, 0, cnt2.wait())
+	})
+}
+
+func TestSource(t *testing.T) {
+	for _, source := range []string{
+		"rtsp_udp",
+		"rtsp_tcp",
+		"rtsps",
+		"rtmp_videoaudio",
+		"rtmp_video",
+	} {
+		t.Run(source, func(t *testing.T) {
+			switch source {
+			case "rtsp_udp", "rtsp_tcp":
+				p1, ok := testProgram("rtspPort: 8555\n" +
+					"rtpPort: 8100\n" +
+					"rtcpPort: 8101\n" +
+					"paths:\n" +
+					"  all:\n" +
+					"    readUser: testuser\n" +
+					"    readPass: testpass\n")
+				require.Equal(t, true, ok)
+				defer p1.close()
+
+				cnt1, err := newContainer("ffmpeg", "source", []string{
+					"-re",
+					"-stream_loop", "-1",
+					"-i", "emptyvideo.ts",
+					"-c", "copy",
+					"-f", "rtsp",
+					"-rtsp_transport", "udp",
+					"rtsp://" + ownDockerIP + ":8555/teststream",
+				})
+				require.NoError(t, err)
+				defer cnt1.close()
+
+				p2, ok := testProgram("paths:\n" +
+					"  proxied:\n" +
+					"    source: rtsp://testuser:testpass@localhost:8555/teststream\n" +
+					"    sourceProtocol: " + source[len("rtsp_"):] + "\n" +
+					"    sourceOnDemand: yes\n")
+				require.Equal(t, true, ok)
+				defer p2.close()
+
+			case "rtsps":
+				serverCertFpath, err := writeTempFile(serverCert)
+				require.NoError(t, err)
+				defer os.Remove(serverCertFpath)
+
+				serverKeyFpath, err := writeTempFile(serverKey)
+				require.NoError(t, err)
+				defer os.Remove(serverKeyFpath)
+
+				p, ok := testProgram("rtspPort: 8555\n" +
+					"rtpPort: 8100\n" +
+					"rtcpPort: 8101\n" +
+					"readTimeout: 20s\n" +
+					"protocols: [tcp]\n" +
+					"encryption: yes\n" +
+					"serverCert: " + serverCertFpath + "\n" +
+					"serverKey: " + serverKeyFpath + "\n" +
+					"paths:\n" +
+					"  all:\n" +
+					"    readUser: testuser\n" +
+					"    readPass: testpass\n")
+				require.Equal(t, true, ok)
+				defer p.close()
+
+				cnt1, err := newContainer("ffmpeg", "source", []string{
+					"-re",
+					"-stream_loop", "-1",
+					"-i", "emptyvideo.ts",
+					"-c", "copy",
+					"-f", "rtsp",
+					"rtsps://" + ownDockerIP + ":8555/teststream",
+				})
+				require.NoError(t, err)
+				defer cnt1.close()
+
+				time.Sleep(1 * time.Second)
+
+				p2, ok := testProgram("paths:\n" +
+					"  proxied:\n" +
+					"    source: rtsps://testuser:testpass@localhost:8555/teststream\n" +
+					"    sourceOnDemand: yes\n")
+				require.Equal(t, true, ok)
+				defer p2.close()
+
+			case "rtmp_videoaudio", "rtmp_video":
+				cnt1, err := newContainer("nginx-rtmp", "rtmpserver", []string{})
+				require.NoError(t, err)
+				defer cnt1.close()
+
+				input := "emptyvideoaudio.ts"
+				if source == "rtmp_video" {
+					input = "emptyvideo.ts"
+				}
+
+				cnt2, err := newContainer("ffmpeg", "source", []string{
+					"-re",
+					"-stream_loop", "-1",
+					"-i", input,
+					"-c", "copy",
+					"-f", "flv",
+					"rtmp://" + cnt1.ip() + "/stream/test",
+				})
+				require.NoError(t, err)
+				defer cnt2.close()
+
+				time.Sleep(1 * time.Second)
+
+				p, ok := testProgram("paths:\n" +
+					"  proxied:\n" +
+					"    source: rtmp://" + cnt1.ip() + "/stream/test\n" +
+					"    sourceOnDemand: yes\n")
+				require.Equal(t, true, ok)
+				defer p.close()
+			}
+
+			time.Sleep(1 * time.Second)
+
+			cnt3, err := newContainer("ffmpeg", "dest", []string{
+				"-rtsp_transport", "udp",
+				"-i", "rtsp://" + ownDockerIP + ":8554/proxied",
+				"-vframes", "1",
+				"-f", "image2",
+				"-y", "/dev/null",
+			})
+			require.NoError(t, err)
+			defer cnt3.close()
+			require.Equal(t, 0, cnt3.wait())
+		})
+	}
+}
+
 func TestHotReloading(t *testing.T) {
 	confPath := filepath.Join(os.TempDir(), "rtsp-conf")