86 files changed, 2367 insertions, 1047 deletions
diff --git a/server/tests/api/activitypub/client.ts b/server/tests/api/activitypub/client.ts
index b6c538e19..be94e219c 100644
--- a/server/tests/api/activitypub/client.ts
+++ b/server/tests/api/activitypub/client.ts
@@ -1,23 +1,65 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
 import 'mocha'
+import * as chai from 'chai'
+import { VideoPlaylistPrivacy } from '@shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  cleanupTests,
+  createVideoPlaylist,
  doubleFollow,
  flushAndRunMultipleServers,
  makeActivityPubGetRequest,
  ServerInfo,
  setAccessTokensToServers,
-  uploadVideo
+  setDefaultVideoChannel,
+  uploadVideoAndGetId
 } from '../../../../shared/extra-utils'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
 describe('Test activitypub', function () {
  let servers: ServerInfo[] = []
-  let videoUUID: string
+  let video: { id: number, uuid: string, shortUUID: string }
+  let playlist: { id: number, uuid: string, shortUUID: string }
+  async function testAccount (path: string) {
+    const res = await makeActivityPubGetRequest(servers[0].url, path)
+    const object = res.body
+    expect(object.type).to.equal('Person')
+    expect(object.id).to.equal('http://localhost:' + servers[0].port + '/accounts/root')
+    expect(object.name).to.equal('root')
+    expect(object.preferredUsername).to.equal('root')
+  }
+  async function testChannel (path: string) {
+    const res = await makeActivityPubGetRequest(servers[0].url, path)
+    const object = res.body
+    expect(object.type).to.equal('Group')
+    expect(object.id).to.equal('http://localhost:' + servers[0].port + '/video-channels/root_channel')
+    expect(object.name).to.equal('Main root channel')
+    expect(object.preferredUsername).to.equal('root_channel')
+  }
+  async function testVideo (path: string) {
+    const res = await makeActivityPubGetRequest(servers[0].url, path)
+    const object = res.body
+    expect(object.type).to.equal('Video')
+    expect(object.id).to.equal('http://localhost:' + servers[0].port + '/videos/watch/' + video.uuid)
+    expect(object.name).to.equal('video')
+  }
+  async function testPlaylist (path: string) {
+    const res = await makeActivityPubGetRequest(servers[0].url, path)
+    const object = res.body
+    expect(object.type).to.equal('Playlist')
+    expect(object.id).to.equal('http://localhost:' + servers[0].port + '/video-playlists/' + playlist.uuid)
+    expect(object.name).to.equal('playlist')
+  }
  before(async function () {
    this.timeout(30000)
@@ -25,38 +67,56 @@ describe('Test activitypub', function () {
    servers = await flushAndRunMultipleServers(2)
    await setAccessTokensToServers(servers)
+    await setDefaultVideoChannel(servers)
    {
-      const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video' })
+      video = await uploadVideoAndGetId({ server: servers[0], videoName: 'video' })
-      videoUUID = res.body.video.uuid
+    }
+    {
+      const playlistAttrs = { displayName: 'playlist', privacy: VideoPlaylistPrivacy.PUBLIC, videoChannelId: servers[0].videoChannel.id }
+      const resCreate = await createVideoPlaylist({ url: servers[0].url, token: servers[0].accessToken, playlistAttrs })
+      playlist = resCreate.body.videoPlaylist
    }
    await doubleFollow(servers[0], servers[1])
  })
  it('Should return the account object', async function () {
-    const res = await makeActivityPubGetRequest(servers[0].url, '/accounts/root')
+    await testAccount('/accounts/root')
-    const object = res.body
+    await testAccount('/a/root')
+  })
-    expect(object.type).to.equal('Person')
+  it('Should return the channel object', async function () {
-    expect(object.id).to.equal('http://localhost:' + servers[0].port + '/accounts/root')
+    await testChannel('/video-channels/root_channel')
-    expect(object.name).to.equal('root')
+    await testChannel('/c/root_channel')
-    expect(object.preferredUsername).to.equal('root')
  })
  it('Should return the video object', async function () {
-    const res = await makeActivityPubGetRequest(servers[0].url, '/videos/watch/' + videoUUID)
+    await testVideo('/videos/watch/' + video.id)
-    const object = res.body
+    await testVideo('/videos/watch/' + video.uuid)
+    await testVideo('/videos/watch/' + video.shortUUID)
+    await testVideo('/w/' + video.id)
+    await testVideo('/w/' + video.uuid)
+    await testVideo('/w/' + video.shortUUID)
+  })
-    expect(object.type).to.equal('Video')
+  it('Should return the playlist object', async function () {
-    expect(object.id).to.equal('http://localhost:' + servers[0].port + '/videos/watch/' + videoUUID)
+    await testPlaylist('/video-playlists/' + playlist.id)
-    expect(object.name).to.equal('video')
+    await testPlaylist('/video-playlists/' + playlist.uuid)
+    await testPlaylist('/video-playlists/' + playlist.shortUUID)
+    await testPlaylist('/w/p/' + playlist.id)
+    await testPlaylist('/w/p/' + playlist.uuid)
+    await testPlaylist('/w/p/' + playlist.shortUUID)
+    await testPlaylist('/videos/watch/playlist/' + playlist.id)
+    await testPlaylist('/videos/watch/playlist/' + playlist.uuid)
+    await testPlaylist('/videos/watch/playlist/' + playlist.shortUUID)
  })
  it('Should redirect to the origin video object', async function () {
-    const res = await makeActivityPubGetRequest(servers[1].url, '/videos/watch/' + videoUUID, HttpStatusCode.FOUND_302)
+    const res = await makeActivityPubGetRequest(servers[1].url, '/videos/watch/' + video.uuid, HttpStatusCode.FOUND_302)
-    expect(res.header.location).to.equal('http://localhost:' + servers[0].port + '/videos/watch/' + videoUUID)
+    expect(res.header.location).to.equal('http://localhost:' + servers[0].port + '/videos/watch/' + video.uuid)
  })
  after(async function () {
diff --git a/server/tests/api/activitypub/helpers.ts b/server/tests/api/activitypub/helpers.ts
index 60d95b823..66d7631b7 100644
--- a/server/tests/api/activitypub/helpers.ts
+++ b/server/tests/api/activitypub/helpers.ts
@@ -6,13 +6,14 @@ import { buildRequestStub } from '../../../../shared/extra-utils/miscs/stubs'
 import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto'
 import { cloneDeep } from 'lodash'
 import { buildSignedActivity } from '../../../helpers/activitypub'
+import { buildAbsoluteFixturePath } from '@shared/extra-utils'
 describe('Test activity pub helpers', function () {
  describe('When checking the Linked Signature', function () {
    it('Should fail with an invalid Mastodon signature', async function () {
-      const body = require('./json/mastodon/create-bad-signature.json')
+      const body = require(buildAbsoluteFixturePath('./ap-json/mastodon/create-bad-signature.json'))
-      const publicKey = require('./json/mastodon/public-key.json').publicKey
+      const publicKey = require(buildAbsoluteFixturePath('./ap-json/mastodon/public-key.json')).publicKey
      const fromActor = { publicKey, url: 'http://localhost:9002/accounts/peertube' }
      const result = await isJsonLDSignatureVerified(fromActor as any, body)
@@ -21,8 +22,8 @@ describe('Test activity pub helpers', function () {
    })
    it('Should fail with an invalid public key', async function () {
-      const body = require('./json/mastodon/create.json')
+      const body = require(buildAbsoluteFixturePath('./ap-json/mastodon/create.json'))
-      const publicKey = require('./json/mastodon/bad-public-key.json').publicKey
+      const publicKey = require(buildAbsoluteFixturePath('./ap-json/mastodon/bad-public-key.json')).publicKey
      const fromActor = { publicKey, url: 'http://localhost:9002/accounts/peertube' }
      const result = await isJsonLDSignatureVerified(fromActor as any, body)
@@ -31,8 +32,8 @@ describe('Test activity pub helpers', function () {
    })
    it('Should succeed with a valid Mastodon signature', async function () {
-      const body = require('./json/mastodon/create.json')
+      const body = require(buildAbsoluteFixturePath('./ap-json/mastodon/create.json'))
-      const publicKey = require('./json/mastodon/public-key.json').publicKey
+      const publicKey = require(buildAbsoluteFixturePath('./ap-json/mastodon/public-key.json')).publicKey
      const fromActor = { publicKey, url: 'http://localhost:9002/accounts/peertube' }
      const result = await isJsonLDSignatureVerified(fromActor as any, body)
@@ -41,8 +42,8 @@ describe('Test activity pub helpers', function () {
    })
    it('Should fail with an invalid PeerTube signature', async function () {
-      const keys = require('./json/peertube/invalid-keys.json')
+      const keys = require(buildAbsoluteFixturePath('./ap-json/peertube/invalid-keys.json'))
-      const body = require('./json/peertube/announce-without-context.json')
+      const body = require(buildAbsoluteFixturePath('./ap-json/peertube/announce-without-context.json'))
      const actorSignature = { url: 'http://localhost:9002/accounts/peertube', privateKey: keys.privateKey }
      const signedBody = await buildSignedActivity(actorSignature as any, body)
@@ -54,8 +55,8 @@ describe('Test activity pub helpers', function () {
    })
    it('Should succeed with a valid PeerTube signature', async function () {
-      const keys = require('./json/peertube/keys.json')
+      const keys = require(buildAbsoluteFixturePath('./ap-json/peertube/keys.json'))
-      const body = require('./json/peertube/announce-without-context.json')
+      const body = require(buildAbsoluteFixturePath('./ap-json/peertube/announce-without-context.json'))
      const actorSignature = { url: 'http://localhost:9002/accounts/peertube', privateKey: keys.privateKey }
      const signedBody = await buildSignedActivity(actorSignature as any, body)
@@ -73,12 +74,12 @@ describe('Test activity pub helpers', function () {
      req.method = 'POST'
      req.url = '/accounts/ronan/inbox'
-      const mastodonObject = cloneDeep(require('./json/mastodon/bad-http-signature.json'))
+      const mastodonObject = cloneDeep(require(buildAbsoluteFixturePath('./ap-json/mastodon/bad-http-signature.json')))
      req.body = mastodonObject.body
      req.headers = mastodonObject.headers
      const parsed = parseHTTPSignature(req, 3600 * 1000 * 365 * 10)
-      const publicKey = require('./json/mastodon/public-key.json').publicKey
+      const publicKey = require(buildAbsoluteFixturePath('./ap-json/mastodon/public-key.json')).publicKey
      const actor = { publicKey }
      const verified = isHTTPSignatureVerified(parsed, actor as any)
@@ -91,12 +92,12 @@ describe('Test activity pub helpers', function () {
      req.method = 'POST'
      req.url = '/accounts/ronan/inbox'
-      const mastodonObject = cloneDeep(require('./json/mastodon/http-signature.json'))
+      const mastodonObject = cloneDeep(require(buildAbsoluteFixturePath('./ap-json/mastodon/http-signature.json')))
      req.body = mastodonObject.body
      req.headers = mastodonObject.headers
      const parsed = parseHTTPSignature(req, 3600 * 1000 * 365 * 10)
-      const publicKey = require('./json/mastodon/bad-public-key.json').publicKey
+      const publicKey = require(buildAbsoluteFixturePath('./ap-json/mastodon/bad-public-key.json')).publicKey
      const actor = { publicKey }
      const verified = isHTTPSignatureVerified(parsed, actor as any)
@@ -109,7 +110,7 @@ describe('Test activity pub helpers', function () {
      req.method = 'POST'
      req.url = '/accounts/ronan/inbox'
-      const mastodonObject = cloneDeep(require('./json/mastodon/http-signature.json'))
+      const mastodonObject = cloneDeep(require(buildAbsoluteFixturePath('./ap-json/mastodon/http-signature.json')))
      req.body = mastodonObject.body
      req.headers = mastodonObject.headers
@@ -128,7 +129,7 @@ describe('Test activity pub helpers', function () {
      req.method = 'POST'
      req.url = '/accounts/ronan/inbox'
-      const mastodonObject = cloneDeep(require('./json/mastodon/http-signature.json'))
+      const mastodonObject = cloneDeep(require(buildAbsoluteFixturePath('./ap-json/mastodon/http-signature.json')))
      req.body = mastodonObject.body
      req.headers = mastodonObject.headers
      req.headers = 'Signature ' + mastodonObject.headers
@@ -148,12 +149,12 @@ describe('Test activity pub helpers', function () {
      req.method = 'POST'
      req.url = '/accounts/ronan/inbox'
-      const mastodonObject = cloneDeep(require('./json/mastodon/http-signature.json'))
+      const mastodonObject = cloneDeep(require(buildAbsoluteFixturePath('./ap-json/mastodon/http-signature.json')))
      req.body = mastodonObject.body
      req.headers = mastodonObject.headers
      const parsed = parseHTTPSignature(req, 3600 * 1000 * 365 * 10)
-      const publicKey = require('./json/mastodon/public-key.json').publicKey
+      const publicKey = require(buildAbsoluteFixturePath('./ap-json/mastodon/public-key.json')).publicKey
      const actor = { publicKey }
      const verified = isHTTPSignatureVerified(parsed, actor as any)
diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts
index 364b53e0f..61db272f6 100644
--- a/server/tests/api/activitypub/security.ts
+++ b/server/tests/api/activitypub/security.ts
@@ -5,6 +5,7 @@ import * as chai from 'chai'
 import { buildDigest } from '@server/helpers/peertube-crypto'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
+  buildAbsoluteFixturePath,
  cleanupTests,
  closeAllSequelize,
  flushAndRunMultipleServers,
@@ -40,7 +41,7 @@ function setUpdatedAtOfServer (onServer: ServerInfo, ofServer: ServerInfo, updat
 }
 function getAnnounceWithoutContext (server: ServerInfo) {
-  const json = require('./json/peertube/announce-without-context.json')
+  const json = require(buildAbsoluteFixturePath('./ap-json/peertube/announce-without-context.json'))
  const result: typeof json = {}
  for (const key of Object.keys(json)) {
@@ -58,8 +59,8 @@ describe('Test ActivityPub security', function () {
  let servers: ServerInfo[]
  let url: string
-  const keys = require('./json/peertube/keys.json')
+  const keys = require(buildAbsoluteFixturePath('./ap-json/peertube/keys.json'))
-  const invalidKeys = require('./json/peertube/invalid-keys.json')
+  const invalidKeys = require(buildAbsoluteFixturePath('./ap-json/peertube/invalid-keys.json'))
  const baseHttpSignature = () => ({
    algorithm: HTTP_SIGNATURE.ALGORITHM,
    authorizationHeaderName: HTTP_SIGNATURE.HEADER_NAME,
diff --git a/server/tests/api/check-params/abuses.ts b/server/tests/api/check-params/abuses.ts
index 2aa09334c..2054776cc 100644
--- a/server/tests/api/check-params/abuses.ts
+++ b/server/tests/api/check-params/abuses.ts
@@ -258,7 +258,7 @@ describe('Test abuses API validators', function () {
    })
    it('Should succeed with the correct parameters (basic)', async function () {
-      const fields: AbuseCreate = { video: { id: server.video.id }, reason: 'my super reason' }
+      const fields: AbuseCreate = { video: { id: server.video.shortUUID }, reason: 'my super reason' }
      const res = await makePostBodyRequest({
        url: server.url,
diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index 004aa65b3..9549070ef 100644
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -73,7 +73,8 @@ describe('Test config API validators', function () {
    signup: {
      enabled: false,
      limit: 5,
-      requiresEmailVerification: false
+      requiresEmailVerification: false,
+      minimumAge: 16
    },
    admin: {
      email: 'superadmin1@example.com'
diff --git a/server/tests/api/check-params/custom-pages.ts b/server/tests/api/check-params/custom-pages.ts
new file mode 100644
index 000000000..74ca3384c
--- /dev/null
+++ b/server/tests/api/check-params/custom-pages.ts
@@ -0,0 +1,81 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import {
+  cleanupTests,
+  createUser,
+  flushAndRunServer,
+  ServerInfo,
+  setAccessTokensToServers,
+  userLogin
+} from '../../../../shared/extra-utils'
+import { makeGetRequest, makePutBodyRequest } from '../../../../shared/extra-utils/requests/requests'
+describe('Test custom pages validators', function () {
+  const path = '/api/v1/custom-pages/homepage/instance'
+  let server: ServerInfo
+  let userAccessToken: string
+  // ---------------------------------------------------------------
+  before(async function () {
+    this.timeout(120000)
+    server = await flushAndRunServer(1)
+    await setAccessTokensToServers([ server ])
+    const user = { username: 'user1', password: 'password' }
+    await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
+    userAccessToken = await userLogin(server, user)
+  })
+  describe('When updating instance homepage', function () {
+    it('Should fail with an unauthenticated user', async function () {
+      await makePutBodyRequest({
+        url: server.url,
+        path,
+        fields: { content: 'super content' },
+        statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+      })
+    })
+    it('Should fail with a non admin user', async function () {
+      await makePutBodyRequest({
+        url: server.url,
+        path,
+        token: userAccessToken,
+        fields: { content: 'super content' },
+        statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+      })
+    })
+    it('Should succeed with the correct params', async function () {
+      await makePutBodyRequest({
+        url: server.url,
+        path,
+        token: server.accessToken,
+        fields: { content: 'super content' },
+        statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+      })
+    })
+  })
+  describe('When getting instance homapage', function () {
+    it('Should succeed with the correct params', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        statusCodeExpected: HttpStatusCode.OK_200
+      })
+    })
+  })
+  after(async function () {
+    await cleanupTests([ server ])
+  })
+})
diff --git a/server/tests/api/check-params/index.ts b/server/tests/api/check-params/index.ts
index 143515838..ce2335e42 100644
--- a/server/tests/api/check-params/index.ts
+++ b/server/tests/api/check-params/index.ts
@@ -3,6 +3,7 @@ import './accounts'
 import './blocklist'
 import './bulk'
 import './config'
+import './custom-pages'
 import './contact-form'
 import './debug'
 import './follows'
diff --git a/server/tests/api/check-params/live.ts b/server/tests/api/check-params/live.ts
index c171b1f81..933d8abf2 100644
--- a/server/tests/api/check-params/live.ts
+++ b/server/tests/api/check-params/live.ts
@@ -2,9 +2,10 @@
 import 'mocha'
 import { omit } from 'lodash'
-import { join } from 'path'
+import { LiveVideo, VideoCreateResult, VideoPrivacy } from '@shared/models'
-import { LiveVideo, VideoPrivacy } from '@shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
+  buildAbsoluteFixturePath,
  cleanupTests,
  createUser,
  flushAndRunServer,
@@ -24,14 +25,13 @@ import {
  userLogin,
  waitUntilLivePublished
 } from '../../../../shared/extra-utils'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 describe('Test video lives API validator', function () {
  const path = '/api/v1/videos/live'
  let server: ServerInfo
  let userAccessToken = ''
  let channelId: number
-  let videoId: number
+  let video: VideoCreateResult
  let videoIdNotLive: number
  // ---------------------------------------------------------------
@@ -180,7 +180,7 @@ describe('Test video lives API validator', function () {
    it('Should fail with an incorrect thumbnail file', async function () {
      const fields = baseCorrectParams
      const attaches = {
-        thumbnailfile: join(__dirname, '..', '..', 'fixtures', 'video_short.mp4')
+        thumbnailfile: buildAbsoluteFixturePath('video_short.mp4')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -189,7 +189,7 @@ describe('Test video lives API validator', function () {
    it('Should fail with a big thumbnail file', async function () {
      const fields = baseCorrectParams
      const attaches = {
-        thumbnailfile: join(__dirname, '..', '..', 'fixtures', 'preview-big.png')
+        thumbnailfile: buildAbsoluteFixturePath('preview-big.png')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -198,7 +198,7 @@ describe('Test video lives API validator', function () {
    it('Should fail with an incorrect preview file', async function () {
      const fields = baseCorrectParams
      const attaches = {
-        previewfile: join(__dirname, '..', '..', 'fixtures', 'video_short.mp4')
+        previewfile: buildAbsoluteFixturePath('video_short.mp4')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -207,7 +207,7 @@ describe('Test video lives API validator', function () {
    it('Should fail with a big preview file', async function () {
      const fields = baseCorrectParams
      const attaches = {
-        previewfile: join(__dirname, '..', '..', 'fixtures', 'preview-big.png')
+        previewfile: buildAbsoluteFixturePath('preview-big.png')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -230,7 +230,7 @@ describe('Test video lives API validator', function () {
        statusCodeExpected: HttpStatusCode.OK_200
      })
-      videoId = res.body.video.id
+      video = res.body.video
    })
    it('Should forbid if live is disabled', async function () {
@@ -326,15 +326,15 @@ describe('Test video lives API validator', function () {
  describe('When getting live information', function () {
    it('Should fail without access token', async function () {
-      await getLive(server.url, '', videoId, HttpStatusCode.UNAUTHORIZED_401)
+      await getLive(server.url, '', video.id, HttpStatusCode.UNAUTHORIZED_401)
    })
    it('Should fail with a bad access token', async function () {
-      await getLive(server.url, 'toto', videoId, HttpStatusCode.UNAUTHORIZED_401)
+      await getLive(server.url, 'toto', video.id, HttpStatusCode.UNAUTHORIZED_401)
    })
    it('Should fail with access token of another user', async function () {
-      await getLive(server.url, userAccessToken, videoId, HttpStatusCode.FORBIDDEN_403)
+      await getLive(server.url, userAccessToken, video.id, HttpStatusCode.FORBIDDEN_403)
    })
    it('Should fail with a bad video id', async function () {
@@ -350,22 +350,23 @@ describe('Test video lives API validator', function () {
    })
    it('Should succeed with the correct params', async function () {
-      await getLive(server.url, server.accessToken, videoId)
+      await getLive(server.url, server.accessToken, video.id)
+      await getLive(server.url, server.accessToken, video.shortUUID)
    })
  })
  describe('When updating live information', async function () {
    it('Should fail without access token', async function () {
-      await updateLive(server.url, '', videoId, {}, HttpStatusCode.UNAUTHORIZED_401)
+      await updateLive(server.url, '', video.id, {}, HttpStatusCode.UNAUTHORIZED_401)
    })
    it('Should fail with a bad access token', async function () {
-      await updateLive(server.url, 'toto', videoId, {}, HttpStatusCode.UNAUTHORIZED_401)
+      await updateLive(server.url, 'toto', video.id, {}, HttpStatusCode.UNAUTHORIZED_401)
    })
    it('Should fail with access token of another user', async function () {
-      await updateLive(server.url, userAccessToken, videoId, {}, HttpStatusCode.FORBIDDEN_403)
+      await updateLive(server.url, userAccessToken, video.id, {}, HttpStatusCode.FORBIDDEN_403)
    })
    it('Should fail with a bad video id', async function () {
@@ -383,11 +384,12 @@ describe('Test video lives API validator', function () {
    it('Should fail with save replay and permanent live set to true', async function () {
      const fields = { saveReplay: true, permanentLive: true }
-      await updateLive(server.url, server.accessToken, videoId, fields, HttpStatusCode.BAD_REQUEST_400)
+      await updateLive(server.url, server.accessToken, video.id, fields, HttpStatusCode.BAD_REQUEST_400)
    })
    it('Should succeed with the correct params', async function () {
-      await updateLive(server.url, server.accessToken, videoId, { saveReplay: false })
+      await updateLive(server.url, server.accessToken, video.id, { saveReplay: false })
+      await updateLive(server.url, server.accessToken, video.shortUUID, { saveReplay: false })
    })
    it('Should fail to update replay status if replay is not allowed on the instance', async function () {
@@ -398,19 +400,19 @@ describe('Test video lives API validator', function () {
        }
      })
-      await updateLive(server.url, server.accessToken, videoId, { saveReplay: true }, HttpStatusCode.FORBIDDEN_403)
+      await updateLive(server.url, server.accessToken, video.id, { saveReplay: true }, HttpStatusCode.FORBIDDEN_403)
    })
    it('Should fail to update a live if it has already started', async function () {
      this.timeout(40000)
-      const resLive = await getLive(server.url, server.accessToken, videoId)
+      const resLive = await getLive(server.url, server.accessToken, video.id)
      const live: LiveVideo = resLive.body
      const command = sendRTMPStream(live.rtmpUrl, live.streamKey)
-      await waitUntilLivePublished(server.url, server.accessToken, videoId)
+      await waitUntilLivePublished(server.url, server.accessToken, video.id)
-      await updateLive(server.url, server.accessToken, videoId, {}, HttpStatusCode.BAD_REQUEST_400)
+      await updateLive(server.url, server.accessToken, video.id, {}, HttpStatusCode.BAD_REQUEST_400)
      await stopFfmpeg(command)
    })
@@ -418,14 +420,14 @@ describe('Test video lives API validator', function () {
    it('Should fail to stream twice in the save live', async function () {
      this.timeout(40000)
-      const resLive = await getLive(server.url, server.accessToken, videoId)
+      const resLive = await getLive(server.url, server.accessToken, video.id)
      const live: LiveVideo = resLive.body
      const command = sendRTMPStream(live.rtmpUrl, live.streamKey)
-      await waitUntilLivePublished(server.url, server.accessToken, videoId)
+      await waitUntilLivePublished(server.url, server.accessToken, video.id)
-      await runAndTestFfmpegStreamError(server.url, server.accessToken, videoId, true)
+      await runAndTestFfmpegStreamError(server.url, server.accessToken, video.id, true)
      await stopFfmpeg(command)
    })
diff --git a/server/tests/api/check-params/plugins.ts b/server/tests/api/check-params/plugins.ts
index 6e540bcbb..a833fe6ff 100644
--- a/server/tests/api/check-params/plugins.ts
+++ b/server/tests/api/check-params/plugins.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 import 'mocha'
+import { HttpStatusCode } from '@shared/core-utils'
 import {
  checkBadCountPagination,
  checkBadSortPagination,
@@ -11,14 +11,14 @@ import {
  flushAndRunServer,
  immutableAssign,
  installPlugin,
-  makeGetRequest, makePostBodyRequest, makePutBodyRequest,
+  makeGetRequest,
+  makePostBodyRequest,
+  makePutBodyRequest,
  ServerInfo,
  setAccessTokensToServers,
  userLogin
-} from '../../../../shared/extra-utils'
+} from '@shared/extra-utils'
-import { PluginType } from '../../../../shared/models/plugins/plugin.type'
+import { PeerTubePlugin, PluginType } from '@shared/models'
-import { PeerTubePlugin } from '../../../../shared/models/plugins/peertube-plugin.model'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 describe('Test server plugins API validators', function () {
  let server: ServerInfo
diff --git a/server/tests/api/check-params/redundancy.ts b/server/tests/api/check-params/redundancy.ts
index 71be50a6f..dac6938de 100644
--- a/server/tests/api/check-params/redundancy.ts
+++ b/server/tests/api/check-params/redundancy.ts
@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 import 'mocha'
+import { VideoCreateResult } from '@shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  checkBadCountPagination,
  checkBadSortPagination,
@@ -9,20 +10,24 @@ import {
  cleanupTests,
  createUser,
  doubleFollow,
-  flushAndRunMultipleServers, makeDeleteRequest,
+  flushAndRunMultipleServers,
-  makeGetRequest, makePostBodyRequest,
+  getVideo,
+  makeDeleteRequest,
+  makeGetRequest,
+  makePostBodyRequest,
  makePutBodyRequest,
  ServerInfo,
-  setAccessTokensToServers, uploadVideoAndGetId,
+  setAccessTokensToServers,
-  userLogin, waitJobs, getVideoIdFromUUID
+  uploadVideoAndGetId,
+  userLogin,
+  waitJobs
 } from '../../../../shared/extra-utils'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 describe('Test server redundancy API validators', function () {
  let servers: ServerInfo[]
  let userAccessToken = null
  let videoIdLocal: number
-  let videoIdRemote: number
+  let videoRemote: VideoCreateResult
  // ---------------------------------------------------------------
@@ -48,7 +53,8 @@ describe('Test server redundancy API validators', function () {
    await waitJobs(servers)
-    videoIdRemote = await getVideoIdFromUUID(servers[0].url, remoteUUID)
+    const resVideo = await getVideo(servers[0].url, remoteUUID)
+    videoRemote = resVideo.body
  })
  describe('When listing redundancies', function () {
@@ -131,7 +137,13 @@ describe('Test server redundancy API validators', function () {
    })
    it('Should succeed with the correct params', async function () {
-      await makePostBodyRequest({ url, path, token, fields: { videoId: videoIdRemote }, statusCodeExpected: HttpStatusCode.NO_CONTENT_204 })
+      await makePostBodyRequest({
+        url,
+        path,
+        token,
+        fields: { videoId: videoRemote.shortUUID },
+        statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+      })
    })
    it('Should fail if the video is already duplicated', async function () {
@@ -139,7 +151,13 @@ describe('Test server redundancy API validators', function () {
      await waitJobs(servers)
-      await makePostBodyRequest({ url, path, token, fields: { videoId: videoIdRemote }, statusCodeExpected: HttpStatusCode.CONFLICT_409 })
+      await makePostBodyRequest({
+        url,
+        path,
+        token,
+        fields: { videoId: videoRemote.uuid },
+        statusCodeExpected: HttpStatusCode.CONFLICT_409
+      })
    })
  })
diff --git a/server/tests/api/check-params/search.ts b/server/tests/api/check-params/search.ts
index 8378c3a89..20ad46cff 100644
--- a/server/tests/api/check-params/search.ts
+++ b/server/tests/api/check-params/search.ts
@@ -140,6 +140,30 @@ describe('Test videos API validator', function () {
    })
  })
+  describe('When searching video playlists', function () {
+    const path = '/api/v1/search/video-playlists/'
+    const query = {
+      search: 'coucou'
+    }
+    it('Should fail with a bad start pagination', async function () {
+      await checkBadStartPagination(server.url, path, null, query)
+    })
+    it('Should fail with a bad count pagination', async function () {
+      await checkBadCountPagination(server.url, path, null, query)
+    })
+    it('Should fail with an incorrect sort', async function () {
+      await checkBadSortPagination(server.url, path, null, query)
+    })
+    it('Should success with the correct parameters', async function () {
+      await makeGetRequest({ url: server.url, path, query, statusCodeExpected: HttpStatusCode.OK_200 })
+    })
+  })
  describe('When searching video channels', function () {
    const path = '/api/v1/search/video-channels/'
@@ -171,6 +195,7 @@ describe('Test videos API validator', function () {
      const query = { search: 'coucou' }
      const paths = [
+        '/api/v1/search/video-playlists/',
        '/api/v1/search/video-channels/',
        '/api/v1/search/videos/'
      ]
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index dcff0d52b..70a872ce5 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -2,12 +2,12 @@
 import 'mocha'
 import { omit } from 'lodash'
-import { join } from 'path'
+import { User, UserRole, VideoCreateResult } from '../../../../shared'
-import { User, UserRole } from '../../../../shared'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  addVideoChannel,
  blockUser,
+  buildAbsoluteFixturePath,
  cleanupTests,
  createUser,
  deleteMe,
@@ -45,7 +45,7 @@ describe('Test users API validators', function () {
  let userId: number
  let rootId: number
  let moderatorId: number
-  let videoId: number
+  let video: VideoCreateResult
  let server: ServerInfo
  let serverWithRegistrationDisabled: ServerInfo
  let userAccessToken = ''
@@ -126,7 +126,7 @@ describe('Test users API validators', function () {
    {
      const res = await uploadVideo(server.url, server.accessToken, {})
-      videoId = res.body.video.id
+      video = res.body.video
    }
    {
@@ -600,7 +600,7 @@ describe('Test users API validators', function () {
    it('Should fail without an incorrect input file', async function () {
      const fields = {}
      const attaches = {
-        avatarfile: join(__dirname, '..', '..', 'fixtures', 'video_short.mp4')
+        avatarfile: buildAbsoluteFixturePath('video_short.mp4')
      }
      await makeUploadRequest({ url: server.url, path: path + '/me/avatar/pick', token: server.accessToken, fields, attaches })
    })
@@ -608,7 +608,7 @@ describe('Test users API validators', function () {
    it('Should fail with a big file', async function () {
      const fields = {}
      const attaches = {
-        avatarfile: join(__dirname, '..', '..', 'fixtures', 'avatar-big.png')
+        avatarfile: buildAbsoluteFixturePath('avatar-big.png')
      }
      await makeUploadRequest({ url: server.url, path: path + '/me/avatar/pick', token: server.accessToken, fields, attaches })
    })
@@ -616,7 +616,7 @@ describe('Test users API validators', function () {
    it('Should fail with an unauthenticated user', async function () {
      const fields = {}
      const attaches = {
-        avatarfile: join(__dirname, '..', '..', 'fixtures', 'avatar.png')
+        avatarfile: buildAbsoluteFixturePath('avatar.png')
      }
      await makeUploadRequest({
        url: server.url,
@@ -630,7 +630,7 @@ describe('Test users API validators', function () {
    it('Should succeed with the correct params', async function () {
      const fields = {}
      const attaches = {
-        avatarfile: join(__dirname, '..', '..', 'fixtures', 'avatar.png')
+        avatarfile: buildAbsoluteFixturePath('avatar.png')
      }
      await makeUploadRequest({
        url: server.url,
@@ -829,7 +829,7 @@ describe('Test users API validators', function () {
  describe('When getting my video rating', function () {
    it('Should fail with a non authenticated user', async function () {
-      await getMyUserVideoRating(server.url, 'fake_token', videoId, HttpStatusCode.UNAUTHORIZED_401)
+      await getMyUserVideoRating(server.url, 'fake_token', video.id, HttpStatusCode.UNAUTHORIZED_401)
    })
    it('Should fail with an incorrect video uuid', async function () {
@@ -841,7 +841,9 @@ describe('Test users API validators', function () {
    })
    it('Should succeed with the correct parameters', async function () {
-      await getMyUserVideoRating(server.url, server.accessToken, videoId)
+      await getMyUserVideoRating(server.url, server.accessToken, video.id)
+      await getMyUserVideoRating(server.url, server.accessToken, video.uuid)
+      await getMyUserVideoRating(server.url, server.accessToken, video.shortUUID)
    })
  })
diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts
index 3d4837d58..ce7f5fa17 100644
--- a/server/tests/api/check-params/video-blacklist.ts
+++ b/server/tests/api/check-params/video-blacklist.ts
@@ -191,7 +191,7 @@ describe('Test video blacklist API validators', function () {
    })
    it('Should succeed with the correct params', async function () {
-      const path = basePath + servers[0].video.uuid + '/blacklist'
+      const path = basePath + servers[0].video.shortUUID + '/blacklist'
      const fields = { reason: 'hello' }
      await makePutBodyRequest({
@@ -222,10 +222,14 @@ describe('Test video blacklist API validators', function () {
    })
    it('Should succeed with an admin', async function () {
-      const res = await getVideoWithToken(servers[0].url, servers[0].accessToken, servers[0].video.uuid, HttpStatusCode.OK_200)
+      const video = servers[0].video
-      const video: VideoDetails = res.body
-      expect(video.blacklisted).to.be.true
+      for (const id of [ video.id, video.uuid, video.shortUUID ]) {
+        const res = await getVideoWithToken(servers[0].url, servers[0].accessToken, id, HttpStatusCode.OK_200)
+        const video: VideoDetails = res.body
+        expect(video.blacklisted).to.be.true
+      }
    })
  })
diff --git a/server/tests/api/check-params/video-captions.ts b/server/tests/api/check-params/video-captions.ts
index 2f049c03d..c0595c04d 100644
--- a/server/tests/api/check-params/video-captions.ts
+++ b/server/tests/api/check-params/video-captions.ts
@@ -1,7 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 import 'mocha'
+import { VideoCreateResult } from '@shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
+  buildAbsoluteFixturePath,
  cleanupTests,
  createUser,
  flushAndRunServer,
@@ -13,16 +16,14 @@ import {
  uploadVideo,
  userLogin
 } from '../../../../shared/extra-utils'
-import { join } from 'path'
 import { createVideoCaption } from '../../../../shared/extra-utils/videos/video-captions'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 describe('Test video captions API validator', function () {
  const path = '/api/v1/videos/'
  let server: ServerInfo
  let userAccessToken: string
-  let videoUUID: string
+  let video: VideoCreateResult
  // ---------------------------------------------------------------
@@ -35,7 +36,7 @@ describe('Test video captions API validator', function () {
    {
      const res = await uploadVideo(server.url, server.accessToken, {})
-      videoUUID = res.body.video.uuid
+      video = res.body.video
    }
    {
@@ -51,7 +52,7 @@ describe('Test video captions API validator', function () {
  describe('When adding video caption', function () {
    const fields = { }
    const attaches = {
-      captionfile: join(__dirname, '..', '..', 'fixtures', 'subtitle-good1.vtt')
+      captionfile: buildAbsoluteFixturePath('subtitle-good1.vtt')
    }
    it('Should fail without a valid uuid', async function () {
@@ -78,7 +79,7 @@ describe('Test video captions API validator', function () {
    })
    it('Should fail with a missing language in path', async function () {
-      const captionPath = path + videoUUID + '/captions'
+      const captionPath = path + video.uuid + '/captions'
      await makeUploadRequest({
        method: 'PUT',
        url: server.url,
@@ -90,7 +91,7 @@ describe('Test video captions API validator', function () {
    })
    it('Should fail with an unknown language', async function () {
-      const captionPath = path + videoUUID + '/captions/15'
+      const captionPath = path + video.uuid + '/captions/15'
      await makeUploadRequest({
        method: 'PUT',
        url: server.url,
@@ -102,7 +103,7 @@ describe('Test video captions API validator', function () {
    })
    it('Should fail without access token', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.uuid + '/captions/fr'
      await makeUploadRequest({
        method: 'PUT',
        url: server.url,
@@ -114,7 +115,7 @@ describe('Test video captions API validator', function () {
    })
    it('Should fail with a bad access token', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.uuid + '/captions/fr'
      await makeUploadRequest({
        method: 'PUT',
        url: server.url,
@@ -129,10 +130,10 @@ describe('Test video captions API validator', function () {
    // We accept any file now
    // it('Should fail with an invalid captionfile extension', async function () {
    //   const attaches = {
-    //     'captionfile': join(__dirname, '..', '..', 'fixtures', 'subtitle-bad.txt')
+    //     'captionfile': buildAbsoluteFixturePath('subtitle-bad.txt')
    //   }
    //
-    //   const captionPath = path + videoUUID + '/captions/fr'
+    //   const captionPath = path + video.uuid + '/captions/fr'
    //   await makeUploadRequest({
    //     method: 'PUT',
    //     url: server.url,
@@ -150,7 +151,7 @@ describe('Test video captions API validator', function () {
    //     url: server.url,
    //     accessToken: server.accessToken,
    //     language: 'zh',
-    //     videoId: videoUUID,
+    //     videoId: video.uuid,
    //     fixture: 'subtitle-bad.txt',
    //     mimeType: 'application/octet-stream',
    //     statusCodeExpected: HttpStatusCode.BAD_REQUEST_400
@@ -162,7 +163,7 @@ describe('Test video captions API validator', function () {
        url: server.url,
        accessToken: server.accessToken,
        language: 'zh',
-        videoId: videoUUID,
+        videoId: video.uuid,
        fixture: 'subtitle-good.srt',
        mimeType: 'application/octet-stream'
      })
@@ -171,10 +172,10 @@ describe('Test video captions API validator', function () {
    // We don't check the file validity yet
    // it('Should fail with an invalid captionfile srt', async function () {
    //   const attaches = {
-    //     'captionfile': join(__dirname, '..', '..', 'fixtures', 'subtitle-bad.srt')
+    //     'captionfile': buildAbsoluteFixturePath('subtitle-bad.srt')
    //   }
    //
-    //   const captionPath = path + videoUUID + '/captions/fr'
+    //   const captionPath = path + video.uuid + '/captions/fr'
    //   await makeUploadRequest({
    //     method: 'PUT',
    //     url: server.url,
@@ -187,7 +188,7 @@ describe('Test video captions API validator', function () {
    // })
    it('Should success with the correct parameters', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.uuid + '/captions/fr'
      await makeUploadRequest({
        method: 'PUT',
        url: server.url,
@@ -214,7 +215,7 @@ describe('Test video captions API validator', function () {
    })
    it('Should success with the correct parameters', async function () {
-      await makeGetRequest({ url: server.url, path: path + videoUUID + '/captions', statusCodeExpected: HttpStatusCode.OK_200 })
+      await makeGetRequest({ url: server.url, path: path + video.shortUUID + '/captions', statusCodeExpected: HttpStatusCode.OK_200 })
    })
  })
@@ -245,27 +246,27 @@ describe('Test video captions API validator', function () {
    })
    it('Should fail with a missing language', async function () {
-      const captionPath = path + videoUUID + '/captions'
+      const captionPath = path + video.shortUUID + '/captions'
      await makeDeleteRequest({ url: server.url, path: captionPath, token: server.accessToken })
    })
    it('Should fail with an unknown language', async function () {
-      const captionPath = path + videoUUID + '/captions/15'
+      const captionPath = path + video.shortUUID + '/captions/15'
      await makeDeleteRequest({ url: server.url, path: captionPath, token: server.accessToken })
    })
    it('Should fail without access token', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.shortUUID + '/captions/fr'
      await makeDeleteRequest({ url: server.url, path: captionPath, statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401 })
    })
    it('Should fail with a bad access token', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.shortUUID + '/captions/fr'
      await makeDeleteRequest({ url: server.url, path: captionPath, token: 'coucou', statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401 })
    })
    it('Should fail with another user', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.shortUUID + '/captions/fr'
      await makeDeleteRequest({
        url: server.url,
        path: captionPath,
@@ -275,7 +276,7 @@ describe('Test video captions API validator', function () {
    })
    it('Should success with the correct parameters', async function () {
-      const captionPath = path + videoUUID + '/captions/fr'
+      const captionPath = path + video.shortUUID + '/captions/fr'
      await makeDeleteRequest({
        url: server.url,
        path: captionPath,
diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index bc2e6192e..5c02afd31 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -1,9 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
 import * as chai from 'chai'
 import { omit } from 'lodash'
-import 'mocha'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
+  buildAbsoluteFixturePath,
  cleanupTests,
  createUser,
  deleteVideoChannel,
@@ -23,9 +25,7 @@ import {
  checkBadSortPagination,
  checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
-import { join } from 'path'
 import { VideoChannelUpdate } from '../../../../shared/models/videos'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
@@ -246,7 +246,7 @@ describe('Test video channels API validator', function () {
      for (const type of types) {
        const fields = {}
        const attaches = {
-          [type + 'file']: join(__dirname, '..', '..', 'fixtures', 'video_short.mp4')
+          [type + 'file']: buildAbsoluteFixturePath('video_short.mp4')
        }
        await makeUploadRequest({ url: server.url, path: `${path}/${type}/pick`, token: server.accessToken, fields, attaches })
@@ -257,7 +257,7 @@ describe('Test video channels API validator', function () {
      for (const type of types) {
        const fields = {}
        const attaches = {
-          [type + 'file']: join(__dirname, '..', '..', 'fixtures', 'avatar-big.png')
+          [type + 'file']: buildAbsoluteFixturePath('avatar-big.png')
        }
        await makeUploadRequest({ url: server.url, path: `${path}/${type}/pick`, token: server.accessToken, fields, attaches })
      }
@@ -267,7 +267,7 @@ describe('Test video channels API validator', function () {
      for (const type of types) {
        const fields = {}
        const attaches = {
-          [type + 'file']: join(__dirname, '..', '..', 'fixtures', 'avatar.png')
+          [type + 'file']: buildAbsoluteFixturePath('avatar.png')
        }
        await makeUploadRequest({
          url: server.url,
@@ -283,7 +283,7 @@ describe('Test video channels API validator', function () {
      for (const type of types) {
        const fields = {}
        const attaches = {
-          [type + 'file']: join(__dirname, '..', '..', 'fixtures', 'avatar.png')
+          [type + 'file']: buildAbsoluteFixturePath('avatar.png')
        }
        await makeUploadRequest({
          url: server.url,
diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts
index 659a10c41..a38420851 100644
--- a/server/tests/api/check-params/video-comments.ts
+++ b/server/tests/api/check-params/video-comments.ts
@@ -1,7 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
 import 'mocha'
+import * as chai from 'chai'
+import { VideoCreateResult } from '@shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  cleanupTests,
  createUser,
@@ -20,7 +22,6 @@ import {
  checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
 import { addVideoCommentThread } from '../../../../shared/extra-utils/videos/video-comments'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
@@ -28,7 +29,7 @@ describe('Test video comments API validator', function () {
  let pathThread: string
  let pathComment: string
  let server: ServerInfo
-  let videoUUID: string
+  let video: VideoCreateResult
  let userAccessToken: string
  let userAccessToken2: string
  let commentId: number
@@ -44,14 +45,14 @@ describe('Test video comments API validator', function () {
    {
      const res = await uploadVideo(server.url, server.accessToken, {})
-      videoUUID = res.body.video.uuid
+      video = res.body.video
-      pathThread = '/api/v1/videos/' + videoUUID + '/comment-threads'
+      pathThread = '/api/v1/videos/' + video.uuid + '/comment-threads'
    }
    {
-      const res = await addVideoCommentThread(server.url, server.accessToken, videoUUID, 'coucou')
+      const res = await addVideoCommentThread(server.url, server.accessToken, video.uuid, 'coucou')
      commentId = res.body.comment.id
-      pathComment = '/api/v1/videos/' + videoUUID + '/comments/' + commentId
+      pathComment = '/api/v1/videos/' + video.uuid + '/comments/' + commentId
    }
    {
@@ -101,7 +102,7 @@ describe('Test video comments API validator', function () {
    it('Should fail with an incorrect thread id', async function () {
      await makeGetRequest({
        url: server.url,
-        path: '/api/v1/videos/' + videoUUID + '/comment-threads/156',
+        path: '/api/v1/videos/' + video.shortUUID + '/comment-threads/156',
        statusCodeExpected: HttpStatusCode.NOT_FOUND_404
      })
    })
@@ -109,7 +110,7 @@ describe('Test video comments API validator', function () {
    it('Should success with the correct params', async function () {
      await makeGetRequest({
        url: server.url,
-        path: '/api/v1/videos/' + videoUUID + '/comment-threads/' + commentId,
+        path: '/api/v1/videos/' + video.shortUUID + '/comment-threads/' + commentId,
        statusCodeExpected: HttpStatusCode.OK_200
      })
    })
@@ -225,7 +226,7 @@ describe('Test video comments API validator', function () {
    })
    it('Should fail with an incorrect comment', async function () {
-      const path = '/api/v1/videos/' + videoUUID + '/comments/124'
+      const path = '/api/v1/videos/' + video.uuid + '/comments/124'
      const fields = {
        text: 'super comment'
      }
@@ -272,7 +273,7 @@ describe('Test video comments API validator', function () {
    })
    it('Should fail with an incorrect comment', async function () {
-      const path = '/api/v1/videos/' + videoUUID + '/comments/124'
+      const path = '/api/v1/videos/' + video.uuid + '/comments/124'
      await makeDeleteRequest({ url: server.url, path, token: server.accessToken, statusCodeExpected: HttpStatusCode.NOT_FOUND_404 })
    })
@@ -280,11 +281,11 @@ describe('Test video comments API validator', function () {
      let commentToDelete: number
      {
-        const res = await addVideoCommentThread(server.url, userAccessToken, videoUUID, 'hello')
+        const res = await addVideoCommentThread(server.url, userAccessToken, video.uuid, 'hello')
        commentToDelete = res.body.comment.id
      }
-      const path = '/api/v1/videos/' + videoUUID + '/comments/' + commentToDelete
+      const path = '/api/v1/videos/' + video.uuid + '/comments/' + commentToDelete
      await makeDeleteRequest({ url: server.url, path, token: userAccessToken2, statusCodeExpected: HttpStatusCode.FORBIDDEN_403 })
      await makeDeleteRequest({ url: server.url, path, token: userAccessToken, statusCodeExpected: HttpStatusCode.NO_CONTENT_204 })
@@ -323,8 +324,8 @@ describe('Test video comments API validator', function () {
  describe('When a video has comments disabled', function () {
    before(async function () {
      const res = await uploadVideo(server.url, server.accessToken, { commentsEnabled: false })
-      videoUUID = res.body.video.uuid
+      video = res.body.video
-      pathThread = '/api/v1/videos/' + videoUUID + '/comment-threads'
+      pathThread = '/api/v1/videos/' + video.uuid + '/comment-threads'
    })
    it('Should return an empty thread list', async function () {
diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts
index 6de6b40c8..a27b624d0 100644
--- a/server/tests/api/check-params/video-imports.ts
+++ b/server/tests/api/check-params/video-imports.ts
@@ -2,8 +2,9 @@
 import 'mocha'
 import { omit } from 'lodash'
-import { join } from 'path'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
+  buildAbsoluteFixturePath,
  cleanupTests,
  createUser,
  flushAndRunServer,
@@ -22,9 +23,8 @@ import {
  checkBadSortPagination,
  checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
-import { getMagnetURI, getGoodVideoUrl } from '../../../../shared/extra-utils/videos/video-imports'
+import { getGoodVideoUrl, getMagnetURI } from '../../../../shared/extra-utils/videos/video-imports'
 import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 describe('Test video imports API validator', function () {
  const path = '/api/v1/videos/imports'
@@ -201,7 +201,7 @@ describe('Test video imports API validator', function () {
    it('Should fail with an incorrect thumbnail file', async function () {
      const fields = baseCorrectParams
      const attaches = {
-        thumbnailfile: join(__dirname, '..', '..', 'fixtures', 'video_short.mp4')
+        thumbnailfile: buildAbsoluteFixturePath('video_short.mp4')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -210,7 +210,7 @@ describe('Test video imports API validator', function () {
    it('Should fail with a big thumbnail file', async function () {
      const fields = baseCorrectParams
      const attaches = {
-        thumbnailfile: join(__dirname, '..', '..', 'fixtures', 'preview-big.png')
+        thumbnailfile: buildAbsoluteFixturePath('preview-big.png')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -219,7 +219,7 @@ describe('Test video imports API validator', function () {
    it('Should fail with an incorrect preview file', async function () {
      const fields = baseCorrectParams
      const attaches = {
-        previewfile: join(__dirname, '..', '..', 'fixtures', 'video_short.mp4')
+        previewfile: buildAbsoluteFixturePath('video_short.mp4')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -228,7 +228,7 @@ describe('Test video imports API validator', function () {
    it('Should fail with a big preview file', async function () {
      const fields = baseCorrectParams
      const attaches = {
-        previewfile: join(__dirname, '..', '..', 'fixtures', 'preview-big.png')
+        previewfile: buildAbsoluteFixturePath('preview-big.png')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -237,7 +237,7 @@ describe('Test video imports API validator', function () {
    it('Should fail with an invalid torrent file', async function () {
      const fields = omit(baseCorrectParams, 'targetUrl')
      const attaches = {
-        torrentfile: join(__dirname, '..', '..', 'fixtures', 'avatar-big.png')
+        torrentfile: buildAbsoluteFixturePath('avatar-big.png')
      }
      await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches })
@@ -312,7 +312,7 @@ describe('Test video imports API validator', function () {
      fields = omit(fields, 'magnetUri')
      const attaches = {
-        torrentfile: join(__dirname, '..', '..', 'fixtures', 'video-720p.torrent')
+        torrentfile: buildAbsoluteFixturePath('video-720p.torrent')
      }
      await makeUploadRequest({
diff --git a/server/tests/api/check-params/video-playlists.ts b/server/tests/api/check-params/video-playlists.ts
index bbea88354..18253d11a 100644
--- a/server/tests/api/check-params/video-playlists.ts
+++ b/server/tests/api/check-params/video-playlists.ts
@@ -1,8 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 import 'mocha'
+import { VideoPlaylistCreateResult, VideoPlaylistPrivacy, VideoPlaylistType } from '@shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  addVideoInPlaylist,
+  checkBadCountPagination,
+  checkBadSortPagination,
+  checkBadStartPagination,
  cleanupTests,
  createVideoPlaylist,
  deleteVideoPlaylist,
@@ -21,20 +26,14 @@ import {
  updateVideoPlaylistElement,
  uploadVideoAndGetId
 } from '../../../../shared/extra-utils'
-import {
-  checkBadCountPagination,
-  checkBadSortPagination,
-  checkBadStartPagination
-} from '../../../../shared/extra-utils/requests/check-api-params'
-import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
-import { VideoPlaylistType } from '../../../../shared/models/videos/playlist/video-playlist-type.model'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 describe('Test video playlists API validator', function () {
  let server: ServerInfo
  let userAccessToken: string
-  let playlistUUID: string
+  let playlist: VideoPlaylistCreateResult
  let privatePlaylistUUID: string
  let watchLaterPlaylistId: number
  let videoId: number
  let playlistElementId: number
@@ -67,7 +66,7 @@ describe('Test video playlists API validator', function () {
          videoChannelId: server.videoChannel.id
        }
      })
-      playlistUUID = res.body.videoPlaylist.uuid
+      playlist = res.body.videoPlaylist
    }
    {
@@ -150,15 +149,15 @@ describe('Test video playlists API validator', function () {
    const path = '/api/v1/video-playlists/'
    it('Should fail with a bad start pagination', async function () {
-      await checkBadStartPagination(server.url, path + playlistUUID + '/videos', server.accessToken)
+      await checkBadStartPagination(server.url, path + playlist.shortUUID + '/videos', server.accessToken)
    })
    it('Should fail with a bad count pagination', async function () {
-      await checkBadCountPagination(server.url, path + playlistUUID + '/videos', server.accessToken)
+      await checkBadCountPagination(server.url, path + playlist.shortUUID + '/videos', server.accessToken)
    })
    it('Should success with the correct parameters', async function () {
-      await makeGetRequest({ url: server.url, path: path + playlistUUID + '/videos', statusCodeExpected: HttpStatusCode.OK_200 })
+      await makeGetRequest({ url: server.url, path: path + playlist.shortUUID + '/videos', statusCodeExpected: HttpStatusCode.OK_200 })
    })
  })
@@ -177,6 +176,7 @@ describe('Test video playlists API validator', function () {
        token: server.accessToken,
        playlistAttrs: {
          displayName: 'super playlist',
+          videoChannelId: server.videoChannel.id,
          privacy: VideoPlaylistPrivacy.UNLISTED
        }
      })
@@ -187,7 +187,7 @@ describe('Test video playlists API validator', function () {
    })
    it('Should succeed with the correct params', async function () {
-      await getVideoPlaylist(server.url, playlistUUID, HttpStatusCode.OK_200)
+      await getVideoPlaylist(server.url, playlist.uuid, HttpStatusCode.OK_200)
    })
  })
@@ -213,7 +213,7 @@ describe('Test video playlists API validator', function () {
      const params = getBase({}, { token: null, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
      await createVideoPlaylist(params)
-      await updateVideoPlaylist(getUpdate(params, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params, playlist.shortUUID))
    })
    it('Should fail without displayName', async function () {
@@ -226,42 +226,42 @@ describe('Test video playlists API validator', function () {
      const params = getBase({ displayName: 's'.repeat(300) })
      await createVideoPlaylist(params)
-      await updateVideoPlaylist(getUpdate(params, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params, playlist.shortUUID))
    })
    it('Should fail with an incorrect description', async function () {
      const params = getBase({ description: 't' })
      await createVideoPlaylist(params)
-      await updateVideoPlaylist(getUpdate(params, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params, playlist.shortUUID))
    })
    it('Should fail with an incorrect privacy', async function () {
      const params = getBase({ privacy: 45 })
      await createVideoPlaylist(params)
-      await updateVideoPlaylist(getUpdate(params, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params, playlist.shortUUID))
    })
    it('Should fail with an unknown video channel id', async function () {
      const params = getBase({ videoChannelId: 42 }, { expectedStatus: HttpStatusCode.NOT_FOUND_404 })
      await createVideoPlaylist(params)
-      await updateVideoPlaylist(getUpdate(params, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params, playlist.shortUUID))
    })
    it('Should fail with an incorrect thumbnail file', async function () {
      const params = getBase({ thumbnailfile: 'video_short.mp4' })
      await createVideoPlaylist(params)
-      await updateVideoPlaylist(getUpdate(params, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params, playlist.shortUUID))
    })
    it('Should fail with a thumbnail file too big', async function () {
      const params = getBase({ thumbnailfile: 'preview-big.png' })
      await createVideoPlaylist(params)
-      await updateVideoPlaylist(getUpdate(params, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params, playlist.shortUUID))
    })
    it('Should fail to set "public" a playlist not assigned to a channel', async function () {
@@ -272,8 +272,8 @@ describe('Test video playlists API validator', function () {
      await createVideoPlaylist(params)
      await createVideoPlaylist(params2)
      await updateVideoPlaylist(getUpdate(params, privatePlaylistUUID))
-      await updateVideoPlaylist(getUpdate(params2, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params2, playlist.shortUUID))
-      await updateVideoPlaylist(getUpdate(params3, playlistUUID))
+      await updateVideoPlaylist(getUpdate(params3, playlist.shortUUID))
    })
    it('Should fail with an unknown playlist to update', async function () {
@@ -286,7 +286,7 @@ describe('Test video playlists API validator', function () {
    it('Should fail to update a playlist of another user', async function () {
      await updateVideoPlaylist(getUpdate(
        getBase({}, { token: userAccessToken, expectedStatus: HttpStatusCode.FORBIDDEN_403 }),
-        playlistUUID
+        playlist.shortUUID
      ))
    })
@@ -305,7 +305,7 @@ describe('Test video playlists API validator', function () {
      {
        const params = getBase({}, { expectedStatus: HttpStatusCode.NO_CONTENT_204 })
-        await updateVideoPlaylist(getUpdate(params, playlistUUID))
+        await updateVideoPlaylist(getUpdate(params, playlist.shortUUID))
      }
    })
  })
@@ -316,7 +316,7 @@ describe('Test video playlists API validator', function () {
        expectedStatus: HttpStatusCode.BAD_REQUEST_400,
        url: server.url,
        token: server.accessToken,
-        playlistId: playlistUUID,
+        playlistId: playlist.id,
        elementAttrs: Object.assign({
          videoId,
          startTimestamp: 2,
@@ -381,7 +381,7 @@ describe('Test video playlists API validator', function () {
          stopTimestamp: 2
        }, elementAttrs),
        playlistElementId,
-        playlistId: playlistUUID,
+        playlistId: playlist.id,
        expectedStatus: HttpStatusCode.BAD_REQUEST_400
      }, wrapper)
    }
@@ -451,7 +451,7 @@ describe('Test video playlists API validator', function () {
      return Object.assign({
        url: server.url,
        token: server.accessToken,
-        playlistId: playlistUUID,
+        playlistId: playlist.shortUUID,
        elementAttrs: Object.assign({
          startPosition: 1,
          insertAfterPosition: 2,
@@ -469,7 +469,7 @@ describe('Test video playlists API validator', function () {
        await addVideoInPlaylist({
          url: server.url,
          token: server.accessToken,
-          playlistId: playlistUUID,
+          playlistId: playlist.shortUUID,
          elementAttrs: { videoId: id }
        })
      }
@@ -606,7 +606,7 @@ describe('Test video playlists API validator', function () {
        url: server.url,
        token: server.accessToken,
        playlistElementId,
-        playlistId: playlistUUID,
+        playlistId: playlist.uuid,
        expectedStatus: HttpStatusCode.BAD_REQUEST_400
      }, wrapper)
    }
@@ -662,7 +662,7 @@ describe('Test video playlists API validator', function () {
    })
    it('Should fail with a playlist of another user', async function () {
-      await deleteVideoPlaylist(server.url, userAccessToken, playlistUUID, HttpStatusCode.FORBIDDEN_403)
+      await deleteVideoPlaylist(server.url, userAccessToken, playlist.uuid, HttpStatusCode.FORBIDDEN_403)
    })
    it('Should fail with the watch later playlist', async function () {
@@ -670,7 +670,7 @@ describe('Test video playlists API validator', function () {
    })
    it('Should succeed with the correct params', async function () {
-      await deleteVideoPlaylist(server.url, server.accessToken, playlistUUID)
+      await deleteVideoPlaylist(server.url, server.accessToken, playlist.uuid)
    })
  })
diff --git a/server/tests/api/check-params/videos-filter.ts b/server/tests/api/check-params/videos-filter.ts
index 2391584a7..4d54a4fd0 100644
--- a/server/tests/api/check-params/videos-filter.ts
+++ b/server/tests/api/check-params/videos-filter.ts
@@ -35,7 +35,7 @@ async function testEndpoints (server: ServerInfo, token: string, filter: string,
  }
 }
-describe('Test videos filters', function () {
+describe('Test video filters validators', function () {
  let server: ServerInfo
  let userAccessToken: string
  let moderatorAccessToken: string
diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts
index c970c4a15..4d7a9a23b 100644
--- a/server/tests/api/check-params/videos.ts
+++ b/server/tests/api/check-params/videos.ts
@@ -4,6 +4,8 @@ import 'mocha'
 import * as chai from 'chai'
 import { omit } from 'lodash'
 import { join } from 'path'
+import { randomInt } from '@shared/core-utils'
+import { PeerTubeProblemDocument, VideoCreateResult } from '@shared/models'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  checkUploadVideoParam,
@@ -30,7 +32,6 @@ import {
  checkBadStartPagination
 } from '../../../../shared/extra-utils/requests/check-api-params'
 import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
-import { randomInt } from '@shared/core-utils'
 const expect = chai.expect
@@ -41,7 +42,7 @@ describe('Test videos API validator', function () {
  let accountName: string
  let channelId: number
  let channelName: string
-  let videoId
+  let video: VideoCreateResult
  // ---------------------------------------------------------------
@@ -411,6 +412,31 @@ describe('Test videos API validator', function () {
        await checkUploadVideoParam(server.url, server.accessToken, { ...fields, ...attaches }, HttpStatusCode.BAD_REQUEST_400, mode)
      })
+      it('Should report the appropriate error', async function () {
+        const fields = immutableAssign(baseCorrectParams, { language: 'a'.repeat(15) })
+        const attaches = baseCorrectAttaches
+        const attributes = { ...fields, ...attaches }
+        const res = await checkUploadVideoParam(server.url, server.accessToken, attributes, HttpStatusCode.BAD_REQUEST_400, mode)
+        const error = res.body as PeerTubeProblemDocument
+        if (mode === 'legacy') {
+          expect(error.docs).to.equal('https://docs.joinpeertube.org/api-rest-reference.html#operation/uploadLegacy')
+        } else {
+          expect(error.docs).to.equal('https://docs.joinpeertube.org/api-rest-reference.html#operation/uploadResumableInit')
+        }
+        expect(error.type).to.equal('about:blank')
+        expect(error.title).to.equal('Bad Request')
+        expect(error.detail).to.equal('Incorrect request parameters: language')
+        expect(error.error).to.equal('Incorrect request parameters: language')
+        expect(error.status).to.equal(HttpStatusCode.BAD_REQUEST_400)
+        expect(error['invalid-params'].language).to.exist
+      })
      it('Should succeed with the correct parameters', async function () {
        this.timeout(10000)
@@ -464,7 +490,7 @@ describe('Test videos API validator', function () {
    before(async function () {
      const res = await getVideosList(server.url)
-      videoId = res.body.data[0].uuid
+      video = res.body.data[0]
    })
    it('Should fail with nothing', async function () {
@@ -492,79 +518,79 @@ describe('Test videos API validator', function () {
    it('Should fail with a long name', async function () {
      const fields = immutableAssign(baseCorrectParams, { name: 'super'.repeat(65) })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a bad category', async function () {
      const fields = immutableAssign(baseCorrectParams, { category: 125 })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a bad licence', async function () {
      const fields = immutableAssign(baseCorrectParams, { licence: 125 })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a bad language', async function () {
      const fields = immutableAssign(baseCorrectParams, { language: 'a'.repeat(15) })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a long description', async function () {
      const fields = immutableAssign(baseCorrectParams, { description: 'super'.repeat(2500) })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a long support text', async function () {
      const fields = immutableAssign(baseCorrectParams, { support: 'super'.repeat(201) })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a bad channel', async function () {
      const fields = immutableAssign(baseCorrectParams, { channelId: 545454 })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with too many tags', async function () {
      const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6' ] })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a tag length too low', async function () {
      const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 't' ] })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a tag length too big', async function () {
      const fields = immutableAssign(baseCorrectParams, { tags: [ 'tag1', 'my_super_tag_too_long_long_long_long_long_long' ] })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a bad schedule update (miss updateAt)', async function () {
      const fields = immutableAssign(baseCorrectParams, { scheduleUpdate: { privacy: VideoPrivacy.PUBLIC } })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a bad schedule update (wrong updateAt)', async function () {
      const fields = immutableAssign(baseCorrectParams, { scheduleUpdate: { updateAt: 'toto', privacy: VideoPrivacy.PUBLIC } })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with a bad originally published at param', async function () {
      const fields = immutableAssign(baseCorrectParams, { originallyPublishedAt: 'toto' })
-      await makePutBodyRequest({ url: server.url, path: path + videoId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
    })
    it('Should fail with an incorrect thumbnail file', async function () {
@@ -576,7 +602,7 @@ describe('Test videos API validator', function () {
      await makeUploadRequest({
        url: server.url,
        method: 'PUT',
-        path: path + videoId,
+        path: path + video.shortUUID,
        token: server.accessToken,
        fields,
        attaches
@@ -592,7 +618,7 @@ describe('Test videos API validator', function () {
      await makeUploadRequest({
        url: server.url,
        method: 'PUT',
-        path: path + videoId,
+        path: path + video.shortUUID,
        token: server.accessToken,
        fields,
        attaches
@@ -608,7 +634,7 @@ describe('Test videos API validator', function () {
      await makeUploadRequest({
        url: server.url,
        method: 'PUT',
-        path: path + videoId,
+        path: path + video.shortUUID,
        token: server.accessToken,
        fields,
        attaches
@@ -624,7 +650,7 @@ describe('Test videos API validator', function () {
      await makeUploadRequest({
        url: server.url,
        method: 'PUT',
-        path: path + videoId,
+        path: path + video.shortUUID,
        token: server.accessToken,
        fields,
        attaches
@@ -636,7 +662,7 @@ describe('Test videos API validator', function () {
      await makePutBodyRequest({
        url: server.url,
-        path: path + videoId,
+        path: path + video.shortUUID,
        token: userAccessToken,
        fields,
        statusCodeExpected: HttpStatusCode.FORBIDDEN_403
@@ -645,12 +671,30 @@ describe('Test videos API validator', function () {
    it('Should fail with a video of another server')
+    it('Shoud report the appropriate error', async function () {
+      const fields = immutableAssign(baseCorrectParams, { licence: 125 })
+      const res = await makePutBodyRequest({ url: server.url, path: path + video.shortUUID, token: server.accessToken, fields })
+      const error = res.body as PeerTubeProblemDocument
+      expect(error.docs).to.equal('https://docs.joinpeertube.org/api-rest-reference.html#operation/putVideo')
+      expect(error.type).to.equal('about:blank')
+      expect(error.title).to.equal('Bad Request')
+      expect(error.detail).to.equal('Incorrect request parameters: licence')
+      expect(error.error).to.equal('Incorrect request parameters: licence')
+      expect(error.status).to.equal(HttpStatusCode.BAD_REQUEST_400)
+      expect(error['invalid-params'].licence).to.exist
+    })
    it('Should succeed with the correct parameters', async function () {
      const fields = baseCorrectParams
      await makePutBodyRequest({
        url: server.url,
-        path: path + videoId,
+        path: path + video.shortUUID,
        token: server.accessToken,
        fields,
        statusCodeExpected: HttpStatusCode.NO_CONTENT_204
@@ -678,8 +722,24 @@ describe('Test videos API validator', function () {
      await getVideo(server.url, '4da6fde3-88f7-4d16-b119-108df5630b06', HttpStatusCode.NOT_FOUND_404)
    })
+    it('Shoud report the appropriate error', async function () {
+      const res = await getVideo(server.url, 'hi', HttpStatusCode.BAD_REQUEST_400)
+      const error = res.body as PeerTubeProblemDocument
+      expect(error.docs).to.equal('https://docs.joinpeertube.org/api-rest-reference.html#operation/getVideo')
+      expect(error.type).to.equal('about:blank')
+      expect(error.title).to.equal('Bad Request')
+      expect(error.detail).to.equal('Incorrect request parameters: id')
+      expect(error.error).to.equal('Incorrect request parameters: id')
+      expect(error.status).to.equal(HttpStatusCode.BAD_REQUEST_400)
+      expect(error['invalid-params'].id).to.exist
+    })
    it('Should succeed with the correct parameters', async function () {
-      await getVideo(server.url, videoId)
+      await getVideo(server.url, video.shortUUID)
    })
  })
@@ -750,13 +810,29 @@ describe('Test videos API validator', function () {
    })
    it('Should fail with a video of another user without the appropriate right', async function () {
-      await removeVideo(server.url, userAccessToken, videoId, HttpStatusCode.FORBIDDEN_403)
+      await removeVideo(server.url, userAccessToken, video.uuid, HttpStatusCode.FORBIDDEN_403)
    })
    it('Should fail with a video of another server')
+    it('Shoud report the appropriate error', async function () {
+      const res = await removeVideo(server.url, server.accessToken, 'hello', HttpStatusCode.BAD_REQUEST_400)
+      const error = res.body as PeerTubeProblemDocument
+      expect(error.docs).to.equal('https://docs.joinpeertube.org/api-rest-reference.html#operation/delVideo')
+      expect(error.type).to.equal('about:blank')
+      expect(error.title).to.equal('Bad Request')
+      expect(error.detail).to.equal('Incorrect request parameters: id')
+      expect(error.error).to.equal('Incorrect request parameters: id')
+      expect(error.status).to.equal(HttpStatusCode.BAD_REQUEST_400)
+      expect(error['invalid-params'].id).to.exist
+    })
    it('Should succeed with the correct parameters', async function () {
-      await removeVideo(server.url, server.accessToken, videoId)
+      await removeVideo(server.url, server.accessToken, video.uuid)
    })
  })
diff --git a/server/tests/api/live/index.ts b/server/tests/api/live/index.ts
index c733f564e..e6bcef49f 100644
--- a/server/tests/api/live/index.ts
+++ b/server/tests/api/live/index.ts
@@ -1,4 +1,6 @@
 import './live-constraints'
+import './live-socket-messages'
 import './live-permanent'
 import './live-save-replay'
+import './live-views'
 import './live'
diff --git a/server/tests/api/live/live-permanent.ts b/server/tests/api/live/live-permanent.ts
index d52e8c7e4..71b7d28a8 100644
--- a/server/tests/api/live/live-permanent.ts
+++ b/server/tests/api/live/live-permanent.ts
@@ -27,7 +27,7 @@ import {
 const expect = chai.expect
-describe('Permenant live', function () {
+describe('Permanent live', function () {
  let servers: ServerInfo[] = []
  let videoUUID: string
@@ -106,7 +106,7 @@ describe('Permenant live', function () {
  })
  it('Should stream into this permanent live', async function () {
-    this.timeout(60000)
+    this.timeout(120000)
    const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, videoUUID)
diff --git a/server/tests/api/live/live-socket-messages.ts b/server/tests/api/live/live-socket-messages.ts
new file mode 100644
index 000000000..e00909ade
--- /dev/null
+++ b/server/tests/api/live/live-socket-messages.ts
@@ -0,0 +1,196 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
+import * as chai from 'chai'
+import { getLiveNotificationSocket } from '@shared/extra-utils/socket/socket-io'
+import { VideoPrivacy, VideoState } from '@shared/models'
+import {
+  cleanupTests,
+  createLive,
+  doubleFollow,
+  flushAndRunMultipleServers,
+  getVideoIdFromUUID,
+  sendRTMPStreamInVideo,
+  ServerInfo,
+  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  stopFfmpeg,
+  updateCustomSubConfig,
+  viewVideo,
+  wait,
+  waitJobs,
+  waitUntilLiveEnded,
+  waitUntilLivePublishedOnAllServers
+} from '../../../../shared/extra-utils'
+const expect = chai.expect
+describe('Test live', function () {
+  let servers: ServerInfo[] = []
+  before(async function () {
+    this.timeout(120000)
+    servers = await flushAndRunMultipleServers(2)
+    // Get the access tokens
+    await setAccessTokensToServers(servers)
+    await setDefaultVideoChannel(servers)
+    await updateCustomSubConfig(servers[0].url, servers[0].accessToken, {
+      live: {
+        enabled: true,
+        allowReplay: true,
+        transcoding: {
+          enabled: false
+        }
+      }
+    })
+    // Server 1 and server 2 follow each other
+    await doubleFollow(servers[0], servers[1])
+  })
+  describe('Live socket messages', function () {
+    async function createLiveWrapper () {
+      const liveAttributes = {
+        name: 'live video',
+        channelId: servers[0].videoChannel.id,
+        privacy: VideoPrivacy.PUBLIC
+      }
+      const res = await createLive(servers[0].url, servers[0].accessToken, liveAttributes)
+      return res.body.video.uuid
+    }
+    it('Should correctly send a message when the live starts and ends', async function () {
+      this.timeout(60000)
+      const localStateChanges: VideoState[] = []
+      const remoteStateChanges: VideoState[] = []
+      const liveVideoUUID = await createLiveWrapper()
+      await waitJobs(servers)
+      {
+        const videoId = await getVideoIdFromUUID(servers[0].url, liveVideoUUID)
+        const localSocket = getLiveNotificationSocket(servers[0].url)
+        localSocket.on('state-change', data => localStateChanges.push(data.state))
+        localSocket.emit('subscribe', { videoId })
+      }
+      {
+        const videoId = await getVideoIdFromUUID(servers[1].url, liveVideoUUID)
+        const remoteSocket = getLiveNotificationSocket(servers[1].url)
+        remoteSocket.on('state-change', data => remoteStateChanges.push(data.state))
+        remoteSocket.emit('subscribe', { videoId })
+      }
+      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoUUID)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
+      await waitJobs(servers)
+      for (const stateChanges of [ localStateChanges, remoteStateChanges ]) {
+        expect(stateChanges).to.have.length.at.least(1)
+        expect(stateChanges[stateChanges.length - 1]).to.equal(VideoState.PUBLISHED)
+      }
+      await stopFfmpeg(command)
+      for (const server of servers) {
+        await waitUntilLiveEnded(server.url, server.accessToken, liveVideoUUID)
+      }
+      await waitJobs(servers)
+      for (const stateChanges of [ localStateChanges, remoteStateChanges ]) {
+        expect(stateChanges).to.have.length.at.least(2)
+        expect(stateChanges[stateChanges.length - 1]).to.equal(VideoState.LIVE_ENDED)
+      }
+    })
+    it('Should correctly send views change notification', async function () {
+      this.timeout(60000)
+      let localLastVideoViews = 0
+      let remoteLastVideoViews = 0
+      const liveVideoUUID = await createLiveWrapper()
+      await waitJobs(servers)
+      {
+        const videoId = await getVideoIdFromUUID(servers[0].url, liveVideoUUID)
+        const localSocket = getLiveNotificationSocket(servers[0].url)
+        localSocket.on('views-change', data => { localLastVideoViews = data.views })
+        localSocket.emit('subscribe', { videoId })
+      }
+      {
+        const videoId = await getVideoIdFromUUID(servers[1].url, liveVideoUUID)
+        const remoteSocket = getLiveNotificationSocket(servers[1].url)
+        remoteSocket.on('views-change', data => { remoteLastVideoViews = data.views })
+        remoteSocket.emit('subscribe', { videoId })
+      }
+      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoUUID)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
+      await waitJobs(servers)
+      expect(localLastVideoViews).to.equal(0)
+      expect(remoteLastVideoViews).to.equal(0)
+      await viewVideo(servers[0].url, liveVideoUUID)
+      await viewVideo(servers[1].url, liveVideoUUID)
+      await waitJobs(servers)
+      await wait(5000)
+      await waitJobs(servers)
+      expect(localLastVideoViews).to.equal(2)
+      expect(remoteLastVideoViews).to.equal(2)
+      await stopFfmpeg(command)
+    })
+    it('Should not receive a notification after unsubscribe', async function () {
+      this.timeout(120000)
+      const stateChanges: VideoState[] = []
+      const liveVideoUUID = await createLiveWrapper()
+      await waitJobs(servers)
+      const videoId = await getVideoIdFromUUID(servers[0].url, liveVideoUUID)
+      const socket = getLiveNotificationSocket(servers[0].url)
+      socket.on('state-change', data => stateChanges.push(data.state))
+      socket.emit('subscribe', { videoId })
+      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoUUID)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoUUID)
+      await waitJobs(servers)
+      // Notifier waits before sending a notification
+      await wait(10000)
+      expect(stateChanges).to.have.lengthOf(1)
+      socket.emit('unsubscribe', { videoId })
+      await stopFfmpeg(command)
+      await waitJobs(servers)
+      expect(stateChanges).to.have.lengthOf(1)
+    })
+  })
+  after(async function () {
+    await cleanupTests(servers)
+  })
+})
diff --git a/server/tests/api/live/live-views.ts b/server/tests/api/live/live-views.ts
new file mode 100644
index 000000000..a44d21ffa
--- /dev/null
+++ b/server/tests/api/live/live-views.ts
@@ -0,0 +1,130 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
+import * as chai from 'chai'
+import { FfmpegCommand } from 'fluent-ffmpeg'
+import { VideoDetails, VideoPrivacy } from '@shared/models'
+import {
+  cleanupTests,
+  createLive,
+  doubleFollow,
+  flushAndRunMultipleServers,
+  getVideo,
+  sendRTMPStreamInVideo,
+  ServerInfo,
+  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  stopFfmpeg,
+  updateCustomSubConfig,
+  viewVideo,
+  wait,
+  waitJobs,
+  waitUntilLivePublishedOnAllServers
+} from '../../../../shared/extra-utils'
+const expect = chai.expect
+describe('Test live', function () {
+  let servers: ServerInfo[] = []
+  before(async function () {
+    this.timeout(120000)
+    servers = await flushAndRunMultipleServers(2)
+    // Get the access tokens
+    await setAccessTokensToServers(servers)
+    await setDefaultVideoChannel(servers)
+    await updateCustomSubConfig(servers[0].url, servers[0].accessToken, {
+      live: {
+        enabled: true,
+        allowReplay: true,
+        transcoding: {
+          enabled: false
+        }
+      }
+    })
+    // Server 1 and server 2 follow each other
+    await doubleFollow(servers[0], servers[1])
+  })
+  describe('Live views', function () {
+    let liveVideoId: string
+    let command: FfmpegCommand
+    async function countViews (expected: number) {
+      for (const server of servers) {
+        const res = await getVideo(server.url, liveVideoId)
+        const video: VideoDetails = res.body
+        expect(video.views).to.equal(expected)
+      }
+    }
+    before(async function () {
+      this.timeout(30000)
+      const liveAttributes = {
+        name: 'live video',
+        channelId: servers[0].videoChannel.id,
+        privacy: VideoPrivacy.PUBLIC
+      }
+      const res = await createLive(servers[0].url, servers[0].accessToken, liveAttributes)
+      liveVideoId = res.body.video.uuid
+      command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoId)
+      await waitJobs(servers)
+    })
+    it('Should display no views for a live', async function () {
+      await countViews(0)
+    })
+    it('Should view a live twice and display 1 view', async function () {
+      this.timeout(30000)
+      await viewVideo(servers[0].url, liveVideoId)
+      await viewVideo(servers[0].url, liveVideoId)
+      await wait(7000)
+      await waitJobs(servers)
+      await countViews(1)
+    })
+    it('Should wait and display 0 views', async function () {
+      this.timeout(30000)
+      await wait(12000)
+      await waitJobs(servers)
+      await countViews(0)
+    })
+    it('Should view a live on a remote and on local and display 2 views', async function () {
+      this.timeout(30000)
+      await viewVideo(servers[0].url, liveVideoId)
+      await viewVideo(servers[1].url, liveVideoId)
+      await viewVideo(servers[1].url, liveVideoId)
+      await wait(7000)
+      await waitJobs(servers)
+      await countViews(2)
+    })
+    after(async function () {
+      await stopFfmpeg(command)
+    })
+  })
+  after(async function () {
+    await cleanupTests(servers)
+  })
+})
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts
index 57fb58150..50397924e 100644
--- a/server/tests/api/live/live.ts
+++ b/server/tests/api/live/live.ts
@@ -2,10 +2,8 @@
 import 'mocha'
 import * as chai from 'chai'
-import { FfmpegCommand } from 'fluent-ffmpeg'
 import { join } from 'path'
 import { ffprobePromise, getVideoStreamFromFile } from '@server/helpers/ffprobe-utils'
-import { getLiveNotificationSocket } from '@shared/extra-utils/socket/socket-io'
 import { LiveVideo, LiveVideoCreate, Video, VideoDetails, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
@@ -22,7 +20,6 @@ import {
  getMyVideosWithFilter,
  getPlaylist,
  getVideo,
-  getVideoIdFromUUID,
  getVideosList,
  getVideosWithFilters,
  killallServers,
@@ -40,11 +37,11 @@ import {
  updateCustomSubConfig,
  updateLive,
  uploadVideoAndGetId,
-  viewVideo,
  wait,
  waitJobs,
  waitUntilLiveEnded,
  waitUntilLivePublished,
+  waitUntilLivePublishedOnAllServers,
  waitUntilLiveSegmentGeneration
 } from '../../../../shared/extra-utils'
@@ -53,12 +50,6 @@ const expect = chai.expect
 describe('Test live', function () {
  let servers: ServerInfo[] = []
-  async function waitUntilLivePublishedOnAllServers (videoId: string) {
-    for (const server of servers) {
-      await waitUntilLivePublished(server.url, server.accessToken, videoId)
-    }
-  }
  before(async function () {
    this.timeout(120000)
@@ -247,7 +238,7 @@ describe('Test live', function () {
      liveVideoId = resLive.body.video.uuid
      command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId)
-      await waitUntilLivePublishedOnAllServers(liveVideoId)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoId)
      await waitJobs(servers)
    })
@@ -461,7 +452,7 @@ describe('Test live', function () {
      liveVideoId = await createLiveWrapper(false)
      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId)
-      await waitUntilLivePublishedOnAllServers(liveVideoId)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoId)
      await waitJobs(servers)
      await testVideoResolutions(liveVideoId, [ 720 ])
@@ -477,7 +468,7 @@ describe('Test live', function () {
      liveVideoId = await createLiveWrapper(false)
      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId)
-      await waitUntilLivePublishedOnAllServers(liveVideoId)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoId)
      await waitJobs(servers)
      await testVideoResolutions(liveVideoId, resolutions)
@@ -494,7 +485,7 @@ describe('Test live', function () {
      liveVideoId = await createLiveWrapper(true)
      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId, 'video_short2.webm')
-      await waitUntilLivePublishedOnAllServers(liveVideoId)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoId)
      await waitJobs(servers)
      await testVideoResolutions(liveVideoId, resolutions)
@@ -504,7 +495,7 @@ describe('Test live', function () {
      await waitJobs(servers)
-      await waitUntilLivePublishedOnAllServers(liveVideoId)
+      await waitUntilLivePublishedOnAllServers(servers, liveVideoId)
      const bitrateLimits = {
        720: 5000 * 1000, // 60FPS
@@ -559,216 +550,6 @@ describe('Test live', function () {
    })
  })
-  describe('Live views', function () {
-    let liveVideoId: string
-    let command: FfmpegCommand
-    async function countViews (expected: number) {
-      for (const server of servers) {
-        const res = await getVideo(server.url, liveVideoId)
-        const video: VideoDetails = res.body
-        expect(video.views).to.equal(expected)
-      }
-    }
-    before(async function () {
-      this.timeout(30000)
-      const liveAttributes = {
-        name: 'live video',
-        channelId: servers[0].videoChannel.id,
-        privacy: VideoPrivacy.PUBLIC
-      }
-      const res = await createLive(servers[0].url, servers[0].accessToken, liveAttributes)
-      liveVideoId = res.body.video.uuid
-      command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoId)
-      await waitUntilLivePublishedOnAllServers(liveVideoId)
-      await waitJobs(servers)
-    })
-    it('Should display no views for a live', async function () {
-      await countViews(0)
-    })
-    it('Should view a live twice and display 1 view', async function () {
-      this.timeout(30000)
-      await viewVideo(servers[0].url, liveVideoId)
-      await viewVideo(servers[0].url, liveVideoId)
-      await wait(7000)
-      await waitJobs(servers)
-      await countViews(1)
-    })
-    it('Should wait and display 0 views', async function () {
-      this.timeout(30000)
-      await wait(7000)
-      await waitJobs(servers)
-      await countViews(0)
-    })
-    it('Should view a live on a remote and on local and display 2 views', async function () {
-      this.timeout(30000)
-      await viewVideo(servers[0].url, liveVideoId)
-      await viewVideo(servers[1].url, liveVideoId)
-      await viewVideo(servers[1].url, liveVideoId)
-      await wait(7000)
-      await waitJobs(servers)
-      await countViews(2)
-    })
-    after(async function () {
-      await stopFfmpeg(command)
-    })
-  })
-  describe('Live socket messages', function () {
-    async function createLiveWrapper () {
-      const liveAttributes = {
-        name: 'live video',
-        channelId: servers[0].videoChannel.id,
-        privacy: VideoPrivacy.PUBLIC
-      }
-      const res = await createLive(servers[0].url, servers[0].accessToken, liveAttributes)
-      return res.body.video.uuid
-    }
-    it('Should correctly send a message when the live starts and ends', async function () {
-      this.timeout(60000)
-      const localStateChanges: VideoState[] = []
-      const remoteStateChanges: VideoState[] = []
-      const liveVideoUUID = await createLiveWrapper()
-      await waitJobs(servers)
-      {
-        const videoId = await getVideoIdFromUUID(servers[0].url, liveVideoUUID)
-        const localSocket = getLiveNotificationSocket(servers[0].url)
-        localSocket.on('state-change', data => localStateChanges.push(data.state))
-        localSocket.emit('subscribe', { videoId })
-      }
-      {
-        const videoId = await getVideoIdFromUUID(servers[1].url, liveVideoUUID)
-        const remoteSocket = getLiveNotificationSocket(servers[1].url)
-        remoteSocket.on('state-change', data => remoteStateChanges.push(data.state))
-        remoteSocket.emit('subscribe', { videoId })
-      }
-      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoUUID)
-      await waitUntilLivePublishedOnAllServers(liveVideoUUID)
-      await waitJobs(servers)
-      for (const stateChanges of [ localStateChanges, remoteStateChanges ]) {
-        expect(stateChanges).to.have.length.at.least(1)
-        expect(stateChanges[stateChanges.length - 1]).to.equal(VideoState.PUBLISHED)
-      }
-      await stopFfmpeg(command)
-      for (const server of servers) {
-        await waitUntilLiveEnded(server.url, server.accessToken, liveVideoUUID)
-      }
-      await waitJobs(servers)
-      for (const stateChanges of [ localStateChanges, remoteStateChanges ]) {
-        expect(stateChanges).to.have.length.at.least(2)
-        expect(stateChanges[stateChanges.length - 1]).to.equal(VideoState.LIVE_ENDED)
-      }
-    })
-    it('Should correctly send views change notification', async function () {
-      this.timeout(60000)
-      let localLastVideoViews = 0
-      let remoteLastVideoViews = 0
-      const liveVideoUUID = await createLiveWrapper()
-      await waitJobs(servers)
-      {
-        const videoId = await getVideoIdFromUUID(servers[0].url, liveVideoUUID)
-        const localSocket = getLiveNotificationSocket(servers[0].url)
-        localSocket.on('views-change', data => { localLastVideoViews = data.views })
-        localSocket.emit('subscribe', { videoId })
-      }
-      {
-        const videoId = await getVideoIdFromUUID(servers[1].url, liveVideoUUID)
-        const remoteSocket = getLiveNotificationSocket(servers[1].url)
-        remoteSocket.on('views-change', data => { remoteLastVideoViews = data.views })
-        remoteSocket.emit('subscribe', { videoId })
-      }
-      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoUUID)
-      await waitUntilLivePublishedOnAllServers(liveVideoUUID)
-      await waitJobs(servers)
-      expect(localLastVideoViews).to.equal(0)
-      expect(remoteLastVideoViews).to.equal(0)
-      await viewVideo(servers[0].url, liveVideoUUID)
-      await viewVideo(servers[1].url, liveVideoUUID)
-      await waitJobs(servers)
-      await wait(5000)
-      await waitJobs(servers)
-      expect(localLastVideoViews).to.equal(2)
-      expect(remoteLastVideoViews).to.equal(2)
-      await stopFfmpeg(command)
-    })
-    it('Should not receive a notification after unsubscribe', async function () {
-      this.timeout(60000)
-      const stateChanges: VideoState[] = []
-      const liveVideoUUID = await createLiveWrapper()
-      await waitJobs(servers)
-      const videoId = await getVideoIdFromUUID(servers[0].url, liveVideoUUID)
-      const socket = getLiveNotificationSocket(servers[0].url)
-      socket.on('state-change', data => stateChanges.push(data.state))
-      socket.emit('subscribe', { videoId })
-      const command = await sendRTMPStreamInVideo(servers[0].url, servers[0].accessToken, liveVideoUUID)
-      await waitUntilLivePublishedOnAllServers(liveVideoUUID)
-      await waitJobs(servers)
-      expect(stateChanges).to.have.lengthOf(1)
-      socket.emit('unsubscribe', { videoId })
-      await stopFfmpeg(command)
-      await waitJobs(servers)
-      expect(stateChanges).to.have.lengthOf(1)
-    })
-  })
  describe('After a server restart', function () {
    let liveVideoId: string
    let liveVideoReplayId: string
diff --git a/server/tests/api/moderation/blocklist.ts b/server/tests/api/moderation/blocklist.ts
index e8202aff1..793abbcb4 100644
--- a/server/tests/api/moderation/blocklist.ts
+++ b/server/tests/api/moderation/blocklist.ts
@@ -1,46 +1,50 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
 import 'mocha'
-import { AccountBlock, ServerBlock, Video, UserNotification, UserNotificationType } from '../../../../shared/index'
+import * as chai from 'chai'
 import {
+  addAccountToAccountBlocklist,
+  addAccountToServerBlocklist,
+  addServerToAccountBlocklist,
+  addServerToServerBlocklist,
+  addVideoCommentReply,
+  addVideoCommentThread,
  cleanupTests,
  createUser,
  deleteVideoComment,
  doubleFollow,
+  findCommentId,
  flushAndRunMultipleServers,
-  ServerInfo,
-  uploadVideo,
-  userLogin,
  follow,
-  unfollow
-} from '../../../../shared/extra-utils/index'
-import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
-import { getVideosList, getVideosListWithToken } from '../../../../shared/extra-utils/videos/videos'
-import {
-  addVideoCommentReply,
-  addVideoCommentThread,
-  getVideoCommentThreads,
-  getVideoThreadComments,
-  findCommentId
-} from '../../../../shared/extra-utils/videos/video-comments'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
-import {
-  addAccountToAccountBlocklist,
-  addAccountToServerBlocklist,
-  addServerToAccountBlocklist,
-  addServerToServerBlocklist,
  getAccountBlocklistByAccount,
  getAccountBlocklistByServer,
  getServerBlocklistByAccount,
  getServerBlocklistByServer,
+  getUserNotifications,
+  getVideoCommentThreads,
+  getVideosList,
+  getVideosListWithToken,
+  getVideoThreadComments,
  removeAccountFromAccountBlocklist,
  removeAccountFromServerBlocklist,
  removeServerFromAccountBlocklist,
-  removeServerFromServerBlocklist
+  removeServerFromServerBlocklist,
-} from '../../../../shared/extra-utils/users/blocklist'
+  ServerInfo,
-import { getUserNotifications } from '../../../../shared/extra-utils/users/user-notifications'
+  setAccessTokensToServers,
+  unfollow,
+  uploadVideo,
+  userLogin,
+  waitJobs
+} from '@shared/extra-utils'
+import {
+  AccountBlock,
+  ServerBlock,
+  UserNotification,
+  UserNotificationType,
+  Video,
+  VideoComment,
+  VideoCommentThreadTree
+} from '@shared/models'
 const expect = chai.expect
@@ -211,7 +215,7 @@ describe('Test blocklist', function () {
        const threads: VideoComment[] = resThreads.body.data
        expect(threads).to.have.lengthOf(1)
-        expect(threads[0].totalReplies).to.equal(0)
+        expect(threads[0].totalReplies).to.equal(1)
        const t = threads.find(t => t.text === 'comment user 1')
        expect(t).to.be.undefined
@@ -561,7 +565,7 @@ describe('Test blocklist', function () {
          threads = threads.filter(t => t.isDeleted === false)
          expect(threads).to.have.lengthOf(1)
-          expect(threads[0].totalReplies).to.equal(0)
+          expect(threads[0].totalReplies).to.equal(1)
          const t = threads.find(t => t.text === 'comment user 1')
          expect(t).to.be.undefined
diff --git a/server/tests/api/notifications/comments-notifications.ts b/server/tests/api/notifications/comments-notifications.ts
index 5e4ab0d6c..d2badf237 100644
--- a/server/tests/api/notifications/comments-notifications.ts
+++ b/server/tests/api/notifications/comments-notifications.ts
@@ -2,20 +2,25 @@
 import 'mocha'
 import * as chai from 'chai'
-import { cleanupTests, getVideoCommentThreads, getVideoThreadComments, updateMyUser } from '../../../../shared/extra-utils'
-import { ServerInfo, uploadVideo } from '../../../../shared/extra-utils/index'
-import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { addAccountToAccountBlocklist, removeAccountFromAccountBlocklist } from '../../../../shared/extra-utils/users/blocklist'
 import {
+  addAccountToAccountBlocklist,
+  addVideoCommentReply,
+  addVideoCommentThread,
  checkCommentMention,
  CheckerBaseParams,
  checkNewCommentOnMyVideo,
-  prepareNotificationsTest
+  cleanupTests,
-} from '../../../../shared/extra-utils/users/user-notifications'
+  getVideoCommentThreads,
-import { addVideoCommentReply, addVideoCommentThread } from '../../../../shared/extra-utils/videos/video-comments'
+  getVideoThreadComments,
-import { UserNotification } from '../../../../shared/models/users'
+  MockSmtpServer,
-import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
+  prepareNotificationsTest,
+  removeAccountFromAccountBlocklist,
+  ServerInfo,
+  updateMyUser,
+  uploadVideo,
+  waitJobs
+} from '@shared/extra-utils'
+import { UserNotification, VideoCommentThreadTree } from '@shared/models'
 const expect = chai.expect
diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts
index 4ce6675b6..3425480ae 100644
--- a/server/tests/api/notifications/moderation-notifications.ts
+++ b/server/tests/api/notifications/moderation-notifications.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 import 'mocha'
-import { v4 as uuidv4 } from 'uuid'
+import { buildUUID } from '@server/helpers/uuid'
 import { AbuseState } from '@shared/models'
 import {
  addAbuseMessage,
@@ -85,7 +85,7 @@ describe('Test moderation notifications', function () {
    it('Should send a notification to moderators on local video abuse', async function () {
      this.timeout(20000)
-      const name = 'video for abuse ' + uuidv4()
+      const name = 'video for abuse ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
      const video = resVideo.body.video
@@ -98,7 +98,7 @@ describe('Test moderation notifications', function () {
    it('Should send a notification to moderators on remote video abuse', async function () {
      this.timeout(20000)
-      const name = 'video for abuse ' + uuidv4()
+      const name = 'video for abuse ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
      const video = resVideo.body.video
@@ -114,10 +114,10 @@ describe('Test moderation notifications', function () {
    it('Should send a notification to moderators on local comment abuse', async function () {
      this.timeout(20000)
-      const name = 'video for abuse ' + uuidv4()
+      const name = 'video for abuse ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
      const video = resVideo.body.video
-      const resComment = await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + uuidv4())
+      const resComment = await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + buildUUID())
      const comment = resComment.body.comment
      await waitJobs(servers)
@@ -131,10 +131,10 @@ describe('Test moderation notifications', function () {
    it('Should send a notification to moderators on remote comment abuse', async function () {
      this.timeout(20000)
-      const name = 'video for abuse ' + uuidv4()
+      const name = 'video for abuse ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
      const video = resVideo.body.video
-      await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + uuidv4())
+      await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + buildUUID())
      await waitJobs(servers)
@@ -188,7 +188,7 @@ describe('Test moderation notifications', function () {
        token: userAccessToken
      }
-      const name = 'abuse ' + uuidv4()
+      const name = 'abuse ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
      const video = resVideo.body.video
@@ -236,7 +236,7 @@ describe('Test moderation notifications', function () {
        token: servers[0].accessToken
      }
-      const name = 'abuse ' + uuidv4()
+      const name = 'abuse ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
      const video = resVideo.body.video
@@ -307,7 +307,7 @@ describe('Test moderation notifications', function () {
    it('Should send a notification to video owner on blacklist', async function () {
      this.timeout(10000)
-      const name = 'video for abuse ' + uuidv4()
+      const name = 'video for abuse ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
      const uuid = resVideo.body.video.uuid
@@ -320,7 +320,7 @@ describe('Test moderation notifications', function () {
    it('Should send a notification to video owner on unblacklist', async function () {
      this.timeout(10000)
-      const name = 'video for abuse ' + uuidv4()
+      const name = 'video for abuse ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name })
      const uuid = resVideo.body.video.uuid
@@ -507,7 +507,7 @@ describe('Test moderation notifications', function () {
    it('Should send notification to moderators on new video with auto-blacklist', async function () {
      this.timeout(40000)
-      videoName = 'video with auto-blacklist ' + uuidv4()
+      videoName = 'video with auto-blacklist ' + buildUUID()
      const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name: videoName })
      videoUUID = resVideo.body.video.uuid
@@ -553,7 +553,7 @@ describe('Test moderation notifications', function () {
      const updateAt = new Date(new Date().getTime() + 1000000)
-      const name = 'video with auto-blacklist and future schedule ' + uuidv4()
+      const name = 'video with auto-blacklist and future schedule ' + buildUUID()
      const data = {
        name,
@@ -586,7 +586,7 @@ describe('Test moderation notifications', function () {
      // In 2 seconds
      const updateAt = new Date(new Date().getTime() + 2000)
-      const name = 'video with schedule done and still auto-blacklisted ' + uuidv4()
+      const name = 'video with schedule done and still auto-blacklisted ' + buildUUID()
      const data = {
        name,
@@ -609,7 +609,7 @@ describe('Test moderation notifications', function () {
    it('Should not send a notification to moderators on new video without auto-blacklist', async function () {
      this.timeout(60000)
-      const name = 'video without auto-blacklist ' + uuidv4()
+      const name = 'video without auto-blacklist ' + buildUUID()
      // admin with blacklist right will not be auto-blacklisted
      const resVideo = await uploadVideo(servers[0].url, servers[0].accessToken, { name })
diff --git a/server/tests/api/notifications/user-notifications.ts b/server/tests/api/notifications/user-notifications.ts
index 7e88d979b..e981c1718 100644
--- a/server/tests/api/notifications/user-notifications.ts
+++ b/server/tests/api/notifications/user-notifications.ts
@@ -2,7 +2,7 @@
 import 'mocha'
 import * as chai from 'chai'
-import { v4 as uuidv4 } from 'uuid'
+import { buildUUID } from '@server/helpers/uuid'
 import {
  cleanupTests,
  updateMyUser,
@@ -207,7 +207,7 @@ describe('Test user notifications', function () {
    it('Should send a new video notification after a video import', async function () {
      this.timeout(100000)
-      const name = 'video import ' + uuidv4()
+      const name = 'video import ' + buildUUID()
      const attributes = {
        name,
@@ -278,7 +278,7 @@ describe('Test user notifications', function () {
    it('Should send a notification when an imported video is transcoded', async function () {
      this.timeout(50000)
-      const name = 'video import ' + uuidv4()
+      const name = 'video import ' + buildUUID()
      const attributes = {
        name,
@@ -347,7 +347,7 @@ describe('Test user notifications', function () {
    it('Should send a notification when the video import failed', async function () {
      this.timeout(70000)
-      const name = 'video import ' + uuidv4()
+      const name = 'video import ' + buildUUID()
      const attributes = {
        name,
@@ -365,7 +365,7 @@ describe('Test user notifications', function () {
    it('Should send a notification when the video import succeeded', async function () {
      this.timeout(70000)
-      const name = 'video import ' + uuidv4()
+      const name = 'video import ' + buildUUID()
      const attributes = {
        name,
diff --git a/server/tests/api/search/index.ts b/server/tests/api/search/index.ts
index 232c1f2a4..a976d210d 100644
--- a/server/tests/api/search/index.ts
+++ b/server/tests/api/search/index.ts
@@ -1,5 +1,7 @@
+import './search-activitypub-video-playlists'
 import './search-activitypub-video-channels'
 import './search-activitypub-videos'
+import './search-channels'
 import './search-index'
+import './search-playlists'
 import './search-videos'
-import './search-channels'
diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts
index d7e3ed5be..e83eb7171 100644
--- a/server/tests/api/search/search-activitypub-video-channels.ts
+++ b/server/tests/api/search/search-activitypub-video-channels.ts
@@ -106,9 +106,25 @@ describe('Test ActivityPub video channels search', function () {
    }
  })
+  it('Should search a local video channel with an alternative URL', async function () {
+    const search = 'http://localhost:' + servers[0].port + '/c/channel1_server1'
+    for (const token of [ undefined, servers[0].accessToken ]) {
+      const res = await searchVideoChannel(servers[0].url, search, token)
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[0].name).to.equal('channel1_server1')
+      expect(res.body.data[0].displayName).to.equal('Channel 1 server 1')
+    }
+  })
  it('Should search a remote video channel with URL or handle', async function () {
    const searches = [
      'http://localhost:' + servers[1].port + '/video-channels/channel1_server2',
+      'http://localhost:' + servers[1].port + '/c/channel1_server2',
+      'http://localhost:' + servers[1].port + '/c/channel1_server2/videos',
      'channel1_server2@localhost:' + servers[1].port
    ]
diff --git a/server/tests/api/search/search-activitypub-video-playlists.ts b/server/tests/api/search/search-activitypub-video-playlists.ts
new file mode 100644
index 000000000..4c08e9548
--- /dev/null
+++ b/server/tests/api/search/search-activitypub-video-playlists.ts
@@ -0,0 +1,212 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
+import * as chai from 'chai'
+import {
+  addVideoInPlaylist,
+  cleanupTests,
+  createVideoPlaylist,
+  deleteVideoPlaylist,
+  flushAndRunMultipleServers,
+  getVideoPlaylistsList,
+  searchVideoPlaylists,
+  ServerInfo,
+  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  uploadVideoAndGetId,
+  wait
+} from '../../../../shared/extra-utils'
+import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
+import { VideoPlaylist, VideoPlaylistPrivacy } from '../../../../shared/models/videos'
+const expect = chai.expect
+describe('Test ActivityPub playlists search', function () {
+  let servers: ServerInfo[]
+  let playlistServer1UUID: string
+  let playlistServer2UUID: string
+  let video2Server2: string
+  before(async function () {
+    this.timeout(120000)
+    servers = await flushAndRunMultipleServers(2)
+    await setAccessTokensToServers(servers)
+    await setDefaultVideoChannel(servers)
+    {
+      const video1 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 1' })).uuid
+      const video2 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 2' })).uuid
+      const attributes = {
+        displayName: 'playlist 1 on server 1',
+        privacy: VideoPlaylistPrivacy.PUBLIC,
+        videoChannelId: servers[0].videoChannel.id
+      }
+      const res = await createVideoPlaylist({ url: servers[0].url, token: servers[0].accessToken, playlistAttrs: attributes })
+      playlistServer1UUID = res.body.videoPlaylist.uuid
+      for (const videoId of [ video1, video2 ]) {
+        await addVideoInPlaylist({
+          url: servers[0].url,
+          token: servers[0].accessToken,
+          playlistId: playlistServer1UUID,
+          elementAttrs: { videoId }
+        })
+      }
+    }
+    {
+      const videoId = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 1' })).uuid
+      video2Server2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 2' })).uuid
+      const attributes = {
+        displayName: 'playlist 1 on server 2',
+        privacy: VideoPlaylistPrivacy.PUBLIC,
+        videoChannelId: servers[1].videoChannel.id
+      }
+      const res = await createVideoPlaylist({ url: servers[1].url, token: servers[1].accessToken, playlistAttrs: attributes })
+      playlistServer2UUID = res.body.videoPlaylist.uuid
+      await addVideoInPlaylist({
+        url: servers[1].url,
+        token: servers[1].accessToken,
+        playlistId: playlistServer2UUID,
+        elementAttrs: { videoId }
+      })
+    }
+    await waitJobs(servers)
+  })
+  it('Should not find a remote playlist', async function () {
+    {
+      const search = 'http://localhost:' + servers[1].port + '/video-playlists/43'
+      const res = await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(0)
+    }
+    {
+      // Without token
+      const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
+      const res = await searchVideoPlaylists(servers[0].url, search)
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(0)
+    }
+  })
+  it('Should search a local playlist', async function () {
+    const search = 'http://localhost:' + servers[0].port + '/video-playlists/' + playlistServer1UUID
+    const res = await searchVideoPlaylists(servers[0].url, search)
+    expect(res.body.total).to.equal(1)
+    expect(res.body.data).to.be.an('array')
+    expect(res.body.data).to.have.lengthOf(1)
+    expect(res.body.data[0].displayName).to.equal('playlist 1 on server 1')
+    expect(res.body.data[0].videosLength).to.equal(2)
+  })
+  it('Should search a local playlist with an alternative URL', async function () {
+    const searches = [
+      'http://localhost:' + servers[0].port + '/videos/watch/playlist/' + playlistServer1UUID,
+      'http://localhost:' + servers[0].port + '/w/p/' + playlistServer1UUID
+    ]
+    for (const search of searches) {
+      for (const token of [ undefined, servers[0].accessToken ]) {
+        const res = await searchVideoPlaylists(servers[0].url, search, token)
+        expect(res.body.total).to.equal(1)
+        expect(res.body.data).to.be.an('array')
+        expect(res.body.data).to.have.lengthOf(1)
+        expect(res.body.data[0].displayName).to.equal('playlist 1 on server 1')
+        expect(res.body.data[0].videosLength).to.equal(2)
+      }
+    }
+  })
+  it('Should search a remote playlist', async function () {
+    const searches = [
+      'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID,
+      'http://localhost:' + servers[1].port + '/videos/watch/playlist/' + playlistServer2UUID,
+      'http://localhost:' + servers[1].port + '/w/p/' + playlistServer2UUID
+    ]
+    for (const search of searches) {
+      const res = await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[0].displayName).to.equal('playlist 1 on server 2')
+      expect(res.body.data[0].videosLength).to.equal(1)
+    }
+  })
+  it('Should not list this remote playlist', async function () {
+    const res = await getVideoPlaylistsList(servers[0].url, 0, 10)
+    expect(res.body.total).to.equal(1)
+    expect(res.body.data).to.have.lengthOf(1)
+    expect(res.body.data[0].displayName).to.equal('playlist 1 on server 1')
+  })
+  it('Should update the playlist of server 2, and refresh it on server 1', async function () {
+    this.timeout(60000)
+    await addVideoInPlaylist({
+      url: servers[1].url,
+      token: servers[1].accessToken,
+      playlistId: playlistServer2UUID,
+      elementAttrs: { videoId: video2Server2 }
+    })
+    await waitJobs(servers)
+    // Expire playlist
+    await wait(10000)
+    // Will run refresh async
+    const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
+    await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+    // Wait refresh
+    await wait(5000)
+    const res = await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+    expect(res.body.total).to.equal(1)
+    expect(res.body.data).to.have.lengthOf(1)
+    const playlist: VideoPlaylist = res.body.data[0]
+    expect(playlist.videosLength).to.equal(2)
+  })
+  it('Should delete playlist of server 2, and delete it on server 1', async function () {
+    this.timeout(60000)
+    await deleteVideoPlaylist(servers[1].url, servers[1].accessToken, playlistServer2UUID)
+    await waitJobs(servers)
+    // Expiration
+    await wait(10000)
+    // Will run refresh async
+    const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
+    await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+    // Wait refresh
+    await wait(5000)
+    const res = await searchVideoPlaylists(servers[0].url, search, servers[0].accessToken)
+    expect(res.body.total).to.equal(0)
+    expect(res.body.data).to.have.lengthOf(0)
+  })
+  after(async function () {
+    await cleanupTests(servers)
+  })
+})
diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts
index c62dfca0d..e9b4978da 100644
--- a/server/tests/api/search/search-activitypub-videos.ts
+++ b/server/tests/api/search/search-activitypub-videos.ts
@@ -77,14 +77,33 @@ describe('Test ActivityPub videos search', function () {
    expect(res.body.data[0].name).to.equal('video 1 on server 1')
  })
+  it('Should search a local video with an alternative URL', async function () {
+    const search = 'http://localhost:' + servers[0].port + '/w/' + videoServer1UUID
+    const res1 = await searchVideo(servers[0].url, search)
+    const res2 = await searchVideoWithToken(servers[0].url, search, servers[0].accessToken)
+    for (const res of [ res1, res2 ]) {
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[0].name).to.equal('video 1 on server 1')
+    }
+  })
  it('Should search a remote video', async function () {
-    const search = 'http://localhost:' + servers[1].port + '/videos/watch/' + videoServer2UUID
+    const searches = [
-    const res = await searchVideoWithToken(servers[0].url, search, servers[0].accessToken)
+      'http://localhost:' + servers[1].port + '/w/' + videoServer2UUID,
+      'http://localhost:' + servers[1].port + '/videos/watch/' + videoServer2UUID
+    ]
-    expect(res.body.total).to.equal(1)
+    for (const search of searches) {
-    expect(res.body.data).to.be.an('array')
+      const res = await searchVideoWithToken(servers[0].url, search, servers[0].accessToken)
-    expect(res.body.data).to.have.lengthOf(1)
-    expect(res.body.data[0].name).to.equal('video 1 on server 2')
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[0].name).to.equal('video 1 on server 2')
+    }
  })
  it('Should not list this remote video', async function () {
@@ -95,7 +114,7 @@ describe('Test ActivityPub videos search', function () {
  })
  it('Should update video of server 2, and refresh it on server 1', async function () {
-    this.timeout(60000)
+    this.timeout(120000)
    const channelAttributes = {
      name: 'super_channel',
@@ -134,7 +153,7 @@ describe('Test ActivityPub videos search', function () {
  })
  it('Should delete video of server 2, and delete it on server 1', async function () {
-    this.timeout(60000)
+    this.timeout(120000)
    await removeVideo(servers[1].url, servers[1].accessToken, videoServer2UUID)
diff --git a/server/tests/api/search/search-index.ts b/server/tests/api/search/search-index.ts
index 849a8a893..00f79232a 100644
--- a/server/tests/api/search/search-index.ts
+++ b/server/tests/api/search/search-index.ts
@@ -2,19 +2,21 @@
 import 'mocha'
 import * as chai from 'chai'
+import { advancedVideoChannelSearch, searchVideoChannel } from '@shared/extra-utils/search/video-channels'
+import { Video, VideoChannel, VideoPlaylist, VideoPlaylistPrivacy, VideoPlaylistType, VideosSearchQuery } from '@shared/models'
 import {
+  advancedVideoPlaylistSearch,
+  advancedVideosSearch,
  cleanupTests,
  flushAndRunServer,
+  immutableAssign,
  searchVideo,
+  searchVideoPlaylists,
  ServerInfo,
  setAccessTokensToServers,
  updateCustomSubConfig,
-  uploadVideo,
+  uploadVideo
-  advancedVideosSearch,
-  immutableAssign
 } from '../../../../shared/extra-utils'
-import { searchVideoChannel, advancedVideoChannelSearch } from '@shared/extra-utils/search/video-channels'
-import { VideosSearchQuery, Video, VideoChannel } from '@shared/models'
 const expect = chai.expect
@@ -277,6 +279,56 @@ describe('Test videos search', function () {
    })
  })
+  describe('Playlists search', async function () {
+    it('Should make a simple search and not have results', async function () {
+      const res = await searchVideoPlaylists(server.url, 'a'.repeat(500))
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.have.lengthOf(0)
+    })
+    it('Should make a search and have results', async function () {
+      const res = await advancedVideoPlaylistSearch(server.url, { search: 'E2E playlist', sort: '-match' })
+      expect(res.body.total).to.be.greaterThan(0)
+      expect(res.body.data).to.have.length.greaterThan(0)
+      const videoPlaylist: VideoPlaylist = res.body.data[0]
+      expect(videoPlaylist.url).to.equal('https://peertube2.cpy.re/videos/watch/playlist/73804a40-da9a-40c2-b1eb-2c6d9eec8f0a')
+      expect(videoPlaylist.thumbnailUrl).to.exist
+      expect(videoPlaylist.embedUrl).to.equal('https://peertube2.cpy.re/video-playlists/embed/73804a40-da9a-40c2-b1eb-2c6d9eec8f0a')
+      expect(videoPlaylist.type.id).to.equal(VideoPlaylistType.REGULAR)
+      expect(videoPlaylist.privacy.id).to.equal(VideoPlaylistPrivacy.PUBLIC)
+      expect(videoPlaylist.videosLength).to.exist
+      expect(videoPlaylist.createdAt).to.exist
+      expect(videoPlaylist.updatedAt).to.exist
+      expect(videoPlaylist.uuid).to.equal('73804a40-da9a-40c2-b1eb-2c6d9eec8f0a')
+      expect(videoPlaylist.displayName).to.exist
+      expect(videoPlaylist.ownerAccount.url).to.equal('https://peertube2.cpy.re/accounts/chocobozzz')
+      expect(videoPlaylist.ownerAccount.name).to.equal('chocobozzz')
+      expect(videoPlaylist.ownerAccount.host).to.equal('peertube2.cpy.re')
+      expect(videoPlaylist.ownerAccount.avatar).to.exist
+      expect(videoPlaylist.videoChannel.url).to.equal('https://peertube2.cpy.re/video-channels/chocobozzz_channel')
+      expect(videoPlaylist.videoChannel.name).to.equal('chocobozzz_channel')
+      expect(videoPlaylist.videoChannel.host).to.equal('peertube2.cpy.re')
+      expect(videoPlaylist.videoChannel.avatar).to.exist
+    })
+    it('Should have a correct pagination', async function () {
+      const res = await advancedVideoChannelSearch(server.url, { search: 'root', start: 0, count: 2 })
+      expect(res.body.total).to.be.greaterThan(2)
+      expect(res.body.data).to.have.lengthOf(2)
+    })
+  })
  after(async function () {
    await cleanupTests([ server ])
  })
diff --git a/server/tests/api/search/search-playlists.ts b/server/tests/api/search/search-playlists.ts
new file mode 100644
index 000000000..ab17d55e9
--- /dev/null
+++ b/server/tests/api/search/search-playlists.ts
@@ -0,0 +1,128 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
+import * as chai from 'chai'
+import { VideoPlaylist, VideoPlaylistPrivacy } from '@shared/models'
+import {
+  addVideoInPlaylist,
+  advancedVideoPlaylistSearch,
+  cleanupTests,
+  createVideoPlaylist,
+  flushAndRunServer,
+  searchVideoPlaylists,
+  ServerInfo,
+  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  uploadVideoAndGetId
+} from '../../../../shared/extra-utils'
+const expect = chai.expect
+describe('Test playlists search', function () {
+  let server: ServerInfo = null
+  before(async function () {
+    this.timeout(30000)
+    server = await flushAndRunServer(1)
+    await setAccessTokensToServers([ server ])
+    await setDefaultVideoChannel([ server ])
+    const videoId = (await uploadVideoAndGetId({ server: server, videoName: 'video' })).uuid
+    {
+      const attributes = {
+        displayName: 'Dr. Kenzo Tenma hospital videos',
+        privacy: VideoPlaylistPrivacy.PUBLIC,
+        videoChannelId: server.videoChannel.id
+      }
+      const res = await createVideoPlaylist({ url: server.url, token: server.accessToken, playlistAttrs: attributes })
+      await addVideoInPlaylist({
+        url: server.url,
+        token: server.accessToken,
+        playlistId: res.body.videoPlaylist.id,
+        elementAttrs: { videoId }
+      })
+    }
+    {
+      const attributes = {
+        displayName: 'Johan & Anna Libert musics',
+        privacy: VideoPlaylistPrivacy.PUBLIC,
+        videoChannelId: server.videoChannel.id
+      }
+      const res = await createVideoPlaylist({ url: server.url, token: server.accessToken, playlistAttrs: attributes })
+      await addVideoInPlaylist({
+        url: server.url,
+        token: server.accessToken,
+        playlistId: res.body.videoPlaylist.id,
+        elementAttrs: { videoId }
+      })
+    }
+    {
+      const attributes = {
+        displayName: 'Inspector Lunge playlist',
+        privacy: VideoPlaylistPrivacy.PUBLIC,
+        videoChannelId: server.videoChannel.id
+      }
+      await createVideoPlaylist({ url: server.url, token: server.accessToken, playlistAttrs: attributes })
+    }
+  })
+  it('Should make a simple search and not have results', async function () {
+    const res = await searchVideoPlaylists(server.url, 'abc')
+    expect(res.body.total).to.equal(0)
+    expect(res.body.data).to.have.lengthOf(0)
+  })
+  it('Should make a search and have results', async function () {
+    {
+      const search = {
+        search: 'tenma',
+        start: 0,
+        count: 1
+      }
+      const res = await advancedVideoPlaylistSearch(server.url, search)
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.have.lengthOf(1)
+      const playlist: VideoPlaylist = res.body.data[0]
+      expect(playlist.displayName).to.equal('Dr. Kenzo Tenma hospital videos')
+      expect(playlist.url).to.equal(server.url + '/video-playlists/' + playlist.uuid)
+    }
+    {
+      const search = {
+        search: 'Anna Livert',
+        start: 0,
+        count: 1
+      }
+      const res = await advancedVideoPlaylistSearch(server.url, search)
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.have.lengthOf(1)
+      const playlist: VideoPlaylist = res.body.data[0]
+      expect(playlist.displayName).to.equal('Johan & Anna Libert musics')
+    }
+  })
+  it('Should not display playlists without videos', async function () {
+    const search = {
+      search: 'Lunge',
+      start: 0,
+      count: 1
+    }
+    const res = await advancedVideoPlaylistSearch(server.url, search)
+    expect(res.body.total).to.equal(0)
+    expect(res.body.data).to.have.lengthOf(0)
+  })
+  after(async function () {
+    await cleanupTests([ server ])
+  })
+})
diff --git a/server/tests/api/server/bulk.ts b/server/tests/api/server/bulk.ts
index 51ba0e7af..80fa7fce6 100644
--- a/server/tests/api/server/bulk.ts
+++ b/server/tests/api/server/bulk.ts
@@ -2,12 +2,14 @@
 import 'mocha'
 import * as chai from 'chai'
-import { VideoComment } from '@shared/models/videos/video-comment.model'
+import { Video, VideoComment } from '@shared/models'
 import {
+  addVideoCommentReply,
  addVideoCommentThread,
  bulkRemoveCommentsOf,
  cleanupTests,
  createUser,
+  doubleFollow,
  flushAndRunMultipleServers,
  getVideoCommentThreads,
  getVideosList,
@@ -15,11 +17,8 @@ import {
  setAccessTokensToServers,
  uploadVideo,
  userLogin,
-  waitJobs,
+  waitJobs
-  addVideoCommentReply
 } from '../../../../shared/extra-utils/index'
-import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
-import { Video } from '@shared/models'
 const expect = chai.expect
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 1d9ea31df..19bf9582c 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -60,6 +60,7 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) {
  expect(data.signup.enabled).to.be.true
  expect(data.signup.limit).to.equal(4)
+  expect(data.signup.minimumAge).to.equal(16)
  expect(data.signup.requiresEmailVerification).to.be.false
  expect(data.admin.email).to.equal('admin' + server.internalServerNumber + '@example.com')
@@ -151,6 +152,7 @@ function checkUpdatedConfig (data: CustomConfig) {
  expect(data.signup.enabled).to.be.false
  expect(data.signup.limit).to.equal(5)
  expect(data.signup.requiresEmailVerification).to.be.false
+  expect(data.signup.minimumAge).to.equal(10)
  // We override admin email in parallel tests, so skip this exception
  if (parallelTests() === false) {
@@ -316,7 +318,8 @@ describe('Test config', function () {
      signup: {
        enabled: false,
        limit: 5,
-        requiresEmailVerification: false
+        requiresEmailVerification: false,
+        minimumAge: 10
      },
      admin: {
        email: 'superadmin1@example.com'
diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts
index 9b4af1915..8851ad55e 100644
--- a/server/tests/api/server/contact-form.ts
+++ b/server/tests/api/server/contact-form.ts
@@ -54,6 +54,10 @@ describe('Test contact form', function () {
  })
  it('Should not be able to send another contact form because of the anti spam checker', async function () {
+    this.timeout(10000)
+    await wait(1000)
    await sendContactForm({
      url: server.url,
      fromEmail: 'toto@example.com',
diff --git a/server/tests/api/server/follow-constraints.ts b/server/tests/api/server/follow-constraints.ts
index 8a91fbba3..3f2f71f46 100644
--- a/server/tests/api/server/follow-constraints.ts
+++ b/server/tests/api/server/follow-constraints.ts
@@ -18,6 +18,7 @@ import { unfollow } from '../../../../shared/extra-utils/server/follows'
 import { userLogin } from '../../../../shared/extra-utils/users/login'
 import { createUser } from '../../../../shared/extra-utils/users/users'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { PeerTubeProblemDocument, ServerErrorCode } from '@shared/models'
 const expect = chai.expect
@@ -153,7 +154,20 @@ describe('Test follow constraints', function () {
      })
      it('Should not get the remote video', async function () {
-        await getVideo(servers[0].url, video2UUID, HttpStatusCode.FORBIDDEN_403)
+        const res = await getVideo(servers[0].url, video2UUID, HttpStatusCode.FORBIDDEN_403)
+        const error = res.body as PeerTubeProblemDocument
+        const doc = 'https://docs.joinpeertube.org/api-rest-reference.html#section/Errors/does_not_respect_follow_constraints'
+        expect(error.type).to.equal(doc)
+        expect(error.code).to.equal(ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS)
+        expect(error.detail).to.equal('Cannot get this video regarding follow constraints')
+        expect(error.error).to.equal(error.detail)
+        expect(error.status).to.equal(HttpStatusCode.FORBIDDEN_403)
+        expect(error.originUrl).to.contains(servers[1].url)
      })
      it('Should list local account videos', async function () {
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index eb9ab10eb..9e5aa00c7 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -1,37 +1,35 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
 import 'mocha'
-import { Video, VideoPrivacy } from '../../../../shared/models/videos'
+import * as chai from 'chai'
-import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
-import { cleanupTests, completeVideoCheck, deleteVideoComment } from '../../../../shared/extra-utils'
 import {
+  addVideoCommentReply,
+  addVideoCommentThread,
+  cleanupTests,
+  completeVideoCheck,
+  createUser,
+  createVideoCaption,
+  dateIsValid,
+  deleteVideoComment,
+  expectAccountFollows,
  flushAndRunMultipleServers,
-  getVideosList,
-  ServerInfo,
-  setAccessTokensToServers,
-  uploadVideo
-} from '../../../../shared/extra-utils/index'
-import { dateIsValid } from '../../../../shared/extra-utils/miscs/miscs'
-import {
  follow,
  getFollowersListPaginationAndSort,
  getFollowingListPaginationAndSort,
-  unfollow
-} from '../../../../shared/extra-utils/server/follows'
-import { expectAccountFollows } from '../../../../shared/extra-utils/users/accounts'
-import { userLogin } from '../../../../shared/extra-utils/users/login'
-import { createUser } from '../../../../shared/extra-utils/users/users'
-import {
-  addVideoCommentReply,
-  addVideoCommentThread,
  getVideoCommentThreads,
-  getVideoThreadComments
+  getVideosList,
-} from '../../../../shared/extra-utils/videos/video-comments'
+  getVideoThreadComments,
-import { rateVideo } from '../../../../shared/extra-utils/videos/videos'
+  listVideoCaptions,
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
+  rateVideo,
-import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../../../shared/extra-utils/videos/video-captions'
+  ServerInfo,
-import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model'
+  setAccessTokensToServers,
+  testCaptionFile,
+  unfollow,
+  uploadVideo,
+  userLogin,
+  waitJobs
+} from '@shared/extra-utils'
+import { Video, VideoCaption, VideoComment, VideoCommentThreadTree, VideoPrivacy } from '@shared/models'
 const expect = chai.expect
@@ -521,7 +519,7 @@ describe('Test follows', function () {
        expect(deletedComment.text).to.equal('')
        expect(deletedComment.inReplyToCommentId).to.be.null
        expect(deletedComment.account).to.be.null
-        expect(deletedComment.totalReplies).to.equal(3)
+        expect(deletedComment.totalReplies).to.equal(2)
        expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true
        const res2 = await getVideoThreadComments(servers[0].url, video4.id, deletedComment.threadId)
diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts
index 817c79f6e..d57d72f5e 100644
--- a/server/tests/api/server/handle-down.ts
+++ b/server/tests/api/server/handle-down.ts
@@ -4,7 +4,7 @@ import * as chai from 'chai'
 import 'mocha'
 import { JobState, Video } from '../../../../shared/models'
 import { VideoPrivacy } from '../../../../shared/models/videos'
-import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
+import { VideoCommentThreadTree } from '../../../../shared/models/videos/comment/video-comment.model'
 import {
  cleanupTests,
@@ -47,7 +47,7 @@ describe('Test handle downs', function () {
  let missedVideo2: Video
  let unlistedVideo: Video
-  const videoIdsServer1: number[] = []
+  const videoIdsServer1: string[] = []
  const videoAttributes = {
    name: 'my super name for server 1',
@@ -346,10 +346,12 @@ describe('Test handle downs', function () {
    // Wait video expiration
    await wait(11000)
-    for (let i = 0; i < 3; i++) {
+    for (let i = 0; i < 5; i++) {
-      await getVideo(servers[1].url, videoIdsServer1[i])
+      try {
-      await waitJobs([ servers[1] ])
+        await getVideo(servers[1].url, videoIdsServer1[i])
-      await wait(1500)
+        await waitJobs([ servers[1] ])
+        await wait(1500)
+      } catch {}
    }
    for (const id of videoIdsServer1) {
diff --git a/server/tests/api/server/homepage.ts b/server/tests/api/server/homepage.ts
new file mode 100644
index 000000000..e8ba89ca6
--- /dev/null
+++ b/server/tests/api/server/homepage.ts
@@ -0,0 +1,85 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import 'mocha'
+import * as chai from 'chai'
+import { HttpStatusCode } from '@shared/core-utils'
+import { CustomPage, ServerConfig } from '@shared/models'
+import {
+  cleanupTests,
+  flushAndRunServer,
+  getConfig,
+  getInstanceHomepage,
+  killallServers,
+  reRunServer,
+  ServerInfo,
+  setAccessTokensToServers,
+  updateInstanceHomepage
+} from '../../../../shared/extra-utils/index'
+const expect = chai.expect
+async function getHomepageState (server: ServerInfo) {
+  const res = await getConfig(server.url)
+  const config = res.body as ServerConfig
+  return config.homepage.enabled
+}
+describe('Test instance homepage actions', function () {
+  let server: ServerInfo
+  before(async function () {
+    this.timeout(30000)
+    server = await flushAndRunServer(1)
+    await setAccessTokensToServers([ server ])
+  })
+  it('Should not have a homepage', async function () {
+    const state = await getHomepageState(server)
+    expect(state).to.be.false
+    await getInstanceHomepage(server.url, HttpStatusCode.NOT_FOUND_404)
+  })
+  it('Should set a homepage', async function () {
+    await updateInstanceHomepage(server.url, server.accessToken, '<picsou-magazine></picsou-magazine>')
+    const res = await getInstanceHomepage(server.url)
+    const page: CustomPage = res.body
+    expect(page.content).to.equal('<picsou-magazine></picsou-magazine>')
+    const state = await getHomepageState(server)
+    expect(state).to.be.true
+  })
+  it('Should have the same homepage after a restart', async function () {
+    this.timeout(30000)
+    killallServers([ server ])
+    await reRunServer(server)
+    const res = await getInstanceHomepage(server.url)
+    const page: CustomPage = res.body
+    expect(page.content).to.equal('<picsou-magazine></picsou-magazine>')
+    const state = await getHomepageState(server)
+    expect(state).to.be.true
+  })
+  it('Should empty the homepage', async function () {
+    await updateInstanceHomepage(server.url, server.accessToken, '')
+    const res = await getInstanceHomepage(server.url)
+    const page: CustomPage = res.body
+    expect(page.content).to.be.empty
+    const state = await getHomepageState(server)
+    expect(state).to.be.false
+  })
+  after(async function () {
+    await cleanupTests([ server ])
+  })
+})
diff --git a/server/tests/api/server/index.ts b/server/tests/api/server/index.ts
index be743973a..56e6eb5da 100644
--- a/server/tests/api/server/index.ts
+++ b/server/tests/api/server/index.ts
@@ -5,6 +5,7 @@ import './email'
 import './follow-constraints'
 import './follows'
 import './follows-moderation'
+import './homepage'
 import './handle-down'
 import './jobs'
 import './logs'
diff --git a/server/tests/api/server/plugins.ts b/server/tests/api/server/plugins.ts
index f4190c352..6b61c7c33 100644
--- a/server/tests/api/server/plugins.ts
+++ b/server/tests/api/server/plugins.ts
@@ -2,6 +2,7 @@
 import 'mocha'
 import * as chai from 'chai'
+import { HttpStatusCode } from '@shared/core-utils'
 import {
  cleanupTests,
  closeAllSequelize,
@@ -10,6 +11,7 @@ import {
  getMyUserInformation,
  getPlugin,
  getPluginPackageJSON,
+  getPluginTestPath,
  getPublicSettings,
  installPlugin,
  killallServers,
@@ -28,14 +30,8 @@ import {
  updatePluginSettings,
  wait,
  waitUntilLog
-} from '../../../../shared/extra-utils'
+} from '@shared/extra-utils'
-import { PeerTubePluginIndex } from '../../../../shared/models/plugins/peertube-plugin-index.model'
+import { PeerTubePlugin, PeerTubePluginIndex, PluginPackageJson, PluginType, PublicServerSetting, ServerConfig, User } from '@shared/models'
-import { PeerTubePlugin } from '../../../../shared/models/plugins/peertube-plugin.model'
-import { PluginPackageJson } from '../../../../shared/models/plugins/plugin-package-json.model'
-import { PluginType } from '../../../../shared/models/plugins/plugin.type'
-import { PublicServerSetting } from '../../../../shared/models/plugins/public-server.setting'
-import { ServerConfig } from '../../../../shared/models/server'
-import { User } from '../../../../shared/models/users'
 const expect = chai.expect
@@ -406,6 +402,36 @@ describe('Test plugins', function () {
    expect((res.body as User).theme).to.equal('instance-default')
  })
+  it('Should not install a broken plugin', async function () {
+    this.timeout(60000)
+    async function check () {
+      const res = await listPlugins({
+        url: server.url,
+        accessToken: server.accessToken,
+        pluginType: PluginType.PLUGIN
+      })
+      const plugins: PeerTubePlugin[] = res.body.data
+      expect(plugins.find(p => p.name === 'test-broken')).to.not.exist
+    }
+    await installPlugin({
+      url: server.url,
+      accessToken: server.accessToken,
+      path: getPluginTestPath('-broken'),
+      expectedStatus: HttpStatusCode.BAD_REQUEST_400
+    })
+    await check()
+    killallServers([ server ])
+    await reRunServer(server)
+    await check()
+  })
  after(async function () {
    await closeAllSequelize([ server ])
    await cleanupTests([ server ])
diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts
index f0fa91674..ea64e4040 100644
--- a/server/tests/api/server/services.ts
+++ b/server/tests/api/server/services.ts
@@ -67,61 +67,67 @@ describe('Test services', function () {
  })
  it('Should have a valid oEmbed video response', async function () {
-    const oembedUrl = 'http://localhost:' + server.port + '/videos/watch/' + video.uuid
+    for (const basePath of [ '/videos/watch/', '/w/' ]) {
+      const oembedUrl = 'http://localhost:' + server.port + basePath + video.uuid
-    const res = await getOEmbed(server.url, oembedUrl)
-    const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
+      const res = await getOEmbed(server.url, oembedUrl)
-      `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
+      const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
-      'frameborder="0" allowfullscreen></iframe>'
+        `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
-    const expectedThumbnailUrl = 'http://localhost:' + server.port + video.previewPath
+        'frameborder="0" allowfullscreen></iframe>'
+      const expectedThumbnailUrl = 'http://localhost:' + server.port + video.previewPath
-    expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.title).to.equal(video.name)
+      expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.author_name).to.equal(server.videoChannel.displayName)
+      expect(res.body.title).to.equal(video.name)
-    expect(res.body.width).to.equal(560)
+      expect(res.body.author_name).to.equal(server.videoChannel.displayName)
-    expect(res.body.height).to.equal(315)
+      expect(res.body.width).to.equal(560)
-    expect(res.body.thumbnail_url).to.equal(expectedThumbnailUrl)
+      expect(res.body.height).to.equal(315)
-    expect(res.body.thumbnail_width).to.equal(850)
+      expect(res.body.thumbnail_url).to.equal(expectedThumbnailUrl)
-    expect(res.body.thumbnail_height).to.equal(480)
+      expect(res.body.thumbnail_width).to.equal(850)
+      expect(res.body.thumbnail_height).to.equal(480)
+    }
  })
  it('Should have a valid playlist oEmbed response', async function () {
-    const oembedUrl = 'http://localhost:' + server.port + '/videos/watch/playlist/' + playlistUUID
+    for (const basePath of [ '/videos/watch/playlist/', '/w/p/' ]) {
+      const oembedUrl = 'http://localhost:' + server.port + basePath + playlistUUID
-    const res = await getOEmbed(server.url, oembedUrl)
-    const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
+      const res = await getOEmbed(server.url, oembedUrl)
-      `title="${playlistDisplayName}" src="http://localhost:${server.port}/video-playlists/embed/${playlistUUID}" ` +
+      const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
-      'frameborder="0" allowfullscreen></iframe>'
+        `title="${playlistDisplayName}" src="http://localhost:${server.port}/video-playlists/embed/${playlistUUID}" ` +
+        'frameborder="0" allowfullscreen></iframe>'
-    expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.title).to.equal('The Life and Times of Scrooge McDuck')
+      expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.author_name).to.equal(server.videoChannel.displayName)
+      expect(res.body.title).to.equal('The Life and Times of Scrooge McDuck')
-    expect(res.body.width).to.equal(560)
+      expect(res.body.author_name).to.equal(server.videoChannel.displayName)
-    expect(res.body.height).to.equal(315)
+      expect(res.body.width).to.equal(560)
-    expect(res.body.thumbnail_url).exist
+      expect(res.body.height).to.equal(315)
-    expect(res.body.thumbnail_width).to.equal(280)
+      expect(res.body.thumbnail_url).exist
-    expect(res.body.thumbnail_height).to.equal(157)
+      expect(res.body.thumbnail_width).to.equal(280)
+      expect(res.body.thumbnail_height).to.equal(157)
+    }
  })
  it('Should have a valid oEmbed response with small max height query', async function () {
-    const oembedUrl = 'http://localhost:' + server.port + '/videos/watch/' + video.uuid
+    for (const basePath of [ '/videos/watch/', '/w/' ]) {
-    const format = 'json'
+      const oembedUrl = 'http://localhost:' + server.port + basePath + video.uuid
-    const maxHeight = 50
+      const format = 'json'
-    const maxWidth = 50
+      const maxHeight = 50
+      const maxWidth = 50
-    const res = await getOEmbed(server.url, oembedUrl, format, maxHeight, maxWidth)
-    const expectedHtml = '<iframe width="50" height="50" sandbox="allow-same-origin allow-scripts" ' +
+      const res = await getOEmbed(server.url, oembedUrl, format, maxHeight, maxWidth)
-      `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
+      const expectedHtml = '<iframe width="50" height="50" sandbox="allow-same-origin allow-scripts" ' +
-      'frameborder="0" allowfullscreen></iframe>'
+        `title="${video.name}" src="http://localhost:${server.port}/videos/embed/${video.uuid}" ` +
+        'frameborder="0" allowfullscreen></iframe>'
-    expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.title).to.equal(video.name)
+      expect(res.body.html).to.equal(expectedHtml)
-    expect(res.body.author_name).to.equal(server.videoChannel.displayName)
+      expect(res.body.title).to.equal(video.name)
-    expect(res.body.height).to.equal(50)
+      expect(res.body.author_name).to.equal(server.videoChannel.displayName)
-    expect(res.body.width).to.equal(50)
+      expect(res.body.height).to.equal(50)
-    expect(res.body).to.not.have.property('thumbnail_url')
+      expect(res.body.width).to.equal(50)
-    expect(res.body).to.not.have.property('thumbnail_width')
+      expect(res.body).to.not.have.property('thumbnail_url')
-    expect(res.body).to.not.have.property('thumbnail_height')
+      expect(res.body).to.not.have.property('thumbnail_width')
+      expect(res.body).to.not.have.property('thumbnail_height')
+    }
  })
  after(async function () {
diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts
index 1a9a519a0..e0f2f2112 100644
--- a/server/tests/api/users/users-verification.ts
+++ b/server/tests/api/users/users-verification.ts
@@ -19,6 +19,7 @@ import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/l
 import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import { User } from '../../../../shared/models/users'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
@@ -89,8 +90,8 @@ describe('Test users account verification', function () {
  })
  it('Should not allow login for user with unverified email', async function () {
-    const resLogin = await login(server.url, server.client, user1, 400)
+    const resLogin = await login(server.url, server.client, user1, HttpStatusCode.BAD_REQUEST_400)
-    expect(resLogin.body.error).to.contain('User email is not verified.')
+    expect(resLogin.body.detail).to.contain('User email is not verified.')
  })
  it('Should verify the user via email and allow login', async function () {
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index cea98aac7..87ba775f6 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -3,7 +3,7 @@
 import 'mocha'
 import * as chai from 'chai'
 import { AbuseState, AbuseUpdate, MyUser, User, UserRole, Video, VideoPlaylistType } from '@shared/models'
-import { CustomConfig } from '@shared/models/server'
+import { CustomConfig, OAuth2ErrorCode } from '@shared/models/server'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  addVideoCommentThread,
@@ -93,16 +93,20 @@ describe('Test users', function () {
      const client = { id: 'client', secret: server.client.secret }
      const res = await login(server.url, client, server.user, HttpStatusCode.BAD_REQUEST_400)
-      expect(res.body.code).to.equal('invalid_client')
+      expect(res.body.code).to.equal(OAuth2ErrorCode.INVALID_CLIENT)
      expect(res.body.error).to.contain('client is invalid')
+      expect(res.body.type.startsWith('https://')).to.be.true
+      expect(res.body.type).to.contain(OAuth2ErrorCode.INVALID_CLIENT)
    })
    it('Should not login with an invalid client secret', async function () {
      const client = { id: server.client.id, secret: 'coucou' }
      const res = await login(server.url, client, server.user, HttpStatusCode.BAD_REQUEST_400)
-      expect(res.body.code).to.equal('invalid_client')
+      expect(res.body.code).to.equal(OAuth2ErrorCode.INVALID_CLIENT)
      expect(res.body.error).to.contain('client is invalid')
+      expect(res.body.type.startsWith('https://')).to.be.true
+      expect(res.body.type).to.contain(OAuth2ErrorCode.INVALID_CLIENT)
    })
  })
@@ -112,16 +116,20 @@ describe('Test users', function () {
      const user = { username: 'captain crochet', password: server.user.password }
      const res = await login(server.url, server.client, user, HttpStatusCode.BAD_REQUEST_400)
-      expect(res.body.code).to.equal('invalid_grant')
+      expect(res.body.code).to.equal(OAuth2ErrorCode.INVALID_GRANT)
      expect(res.body.error).to.contain('credentials are invalid')
+      expect(res.body.type.startsWith('https://')).to.be.true
+      expect(res.body.type).to.contain(OAuth2ErrorCode.INVALID_GRANT)
    })
    it('Should not login with an invalid password', async function () {
      const user = { username: server.user.username, password: 'mew_three' }
      const res = await login(server.url, server.client, user, HttpStatusCode.BAD_REQUEST_400)
-      expect(res.body.code).to.equal('invalid_grant')
+      expect(res.body.code).to.equal(OAuth2ErrorCode.INVALID_GRANT)
      expect(res.body.error).to.contain('credentials are invalid')
+      expect(res.body.type.startsWith('https://')).to.be.true
+      expect(res.body.type).to.contain(OAuth2ErrorCode.INVALID_GRANT)
    })
    it('Should not be able to upload a video', async function () {
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 41cd814e0..a8c8a889b 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -1,13 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
 import 'mocha'
-import { join } from 'path'
+import * as chai from 'chai'
 import * as request from 'supertest'
-import { VideoPrivacy } from '../../../../shared/models/videos'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
-import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
 import {
  addVideoChannel,
+  buildAbsoluteFixturePath,
  checkTmpIsEmpty,
  checkVideoFilesWereRemoved,
  cleanupTests,
@@ -32,16 +31,16 @@ import {
  wait,
  webtorrentAdd
 } from '../../../../shared/extra-utils'
+import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import {
  addVideoCommentReply,
  addVideoCommentThread,
  deleteVideoComment,
+  findCommentId,
  getVideoCommentThreads,
-  getVideoThreadComments,
+  getVideoThreadComments
-  findCommentId
 } from '../../../../shared/extra-utils/videos/video-comments'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
+import { VideoComment, VideoCommentThreadTree, VideoPrivacy } from '../../../../shared/models/videos'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
@@ -935,7 +934,7 @@ describe('Test multiple servers', function () {
          expect(deletedComment.text).to.equal('')
          expect(deletedComment.inReplyToCommentId).to.be.null
          expect(deletedComment.account).to.be.null
-          expect(deletedComment.totalReplies).to.equal(3)
+          expect(deletedComment.totalReplies).to.equal(2)
          expect(dateIsValid(deletedComment.createdAt as string)).to.be.true
          expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true
          expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true
@@ -977,7 +976,7 @@ describe('Test multiple servers', function () {
          expect(comment.createdAt).to.not.be.null
          expect(comment.deletedAt).to.not.be.null
          expect(comment.account).to.be.null
-          expect(comment.totalReplies).to.equal(3)
+          expect(comment.totalReplies).to.equal(2)
        }
      }
    })
@@ -1019,9 +1018,7 @@ describe('Test multiple servers', function () {
        .field('privacy', '1')
        .field('channelId', '1')
-      const filePath = join(__dirname, '..', '..', 'fixtures', 'video_short.webm')
+      await req.attach('videofile', buildAbsoluteFixturePath('video_short.webm'))
-      await req.attach('videofile', filePath)
               .expect(HttpStatusCode.OK_200)
      await waitJobs(servers)
diff --git a/server/tests/api/videos/resumable-upload.ts b/server/tests/api/videos/resumable-upload.ts
index af9221c43..4fc3317df 100644
--- a/server/tests/api/videos/resumable-upload.ts
+++ b/server/tests/api/videos/resumable-upload.ts
@@ -8,6 +8,7 @@ import { HttpStatusCode } from '@shared/core-utils'
 import {
  buildAbsoluteFixturePath,
  buildServerDirectory,
+  cleanupTests,
  flushAndRunServer,
  getMyUserInformation,
  prepareResumableUpload,
@@ -184,4 +185,7 @@ describe('Test resumable upload', function () {
    })
  })
+  after(async function () {
+    await cleanupTests([ server ])
+  })
 })
diff --git a/server/tests/api/videos/video-change-ownership.ts b/server/tests/api/videos/video-change-ownership.ts
index fad4c8b1f..a3384851b 100644
--- a/server/tests/api/videos/video-change-ownership.ts
+++ b/server/tests/api/videos/video-change-ownership.ts
@@ -1,11 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
 import 'mocha'
+import * as chai from 'chai'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
  acceptChangeOwnership,
  changeVideoOwnership,
  cleanupTests,
+  createLive,
  createUser,
  doubleFollow,
  flushAndRunMultipleServers,
@@ -17,13 +19,14 @@ import {
  refuseChangeOwnership,
  ServerInfo,
  setAccessTokensToServers,
+  setDefaultVideoChannel,
+  updateCustomSubConfig,
  uploadVideo,
  userLogin
 } from '../../../../shared/extra-utils'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import { User } from '../../../../shared/models/users'
-import { VideoDetails } from '../../../../shared/models/videos'
+import { VideoDetails, VideoPrivacy } from '../../../../shared/models/videos'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
@@ -37,15 +40,32 @@ describe('Test video change ownership - nominal', function () {
    username: 'second',
    password: 'My other password'
  }
  let firstUserAccessToken = ''
+  let firstUserChannelId: number
  let secondUserAccessToken = ''
+  let secondUserChannelId: number
  let lastRequestChangeOwnershipId = ''
+  let liveId: number
  before(async function () {
    this.timeout(50000)
    servers = await flushAndRunMultipleServers(2)
    await setAccessTokensToServers(servers)
+    await setDefaultVideoChannel(servers)
+    await updateCustomSubConfig(servers[0].url, servers[0].accessToken, {
+      transcoding: {
+        enabled: false
+      },
+      live: {
+        enabled: true
+      }
+    })
    const videoQuota = 42000000
    await createUser({
@@ -66,22 +86,35 @@ describe('Test video change ownership - nominal', function () {
    firstUserAccessToken = await userLogin(servers[0], firstUser)
    secondUserAccessToken = await userLogin(servers[0], secondUser)
-    const videoAttributes = {
+    {
-      name: 'my super name',
+      const res = await getMyUserInformation(servers[0].url, firstUserAccessToken)
-      description: 'my super description'
+      const firstUserInformation: User = res.body
+      firstUserChannelId = firstUserInformation.videoChannels[0].id
    }
-    await uploadVideo(servers[0].url, firstUserAccessToken, videoAttributes)
-    await waitJobs(servers)
+    {
+      const res = await getMyUserInformation(servers[0].url, secondUserAccessToken)
+      const secondUserInformation: User = res.body
+      secondUserChannelId = secondUserInformation.videoChannels[0].id
+    }
-    const res = await getVideosList(servers[0].url)
+    {
-    const videos = res.body.data
+      const videoAttributes = {
+        name: 'my super name',
+        description: 'my super description'
+      }
+      const res = await uploadVideo(servers[0].url, firstUserAccessToken, videoAttributes)
-    expect(videos.length).to.equal(1)
+      const resVideo = await getVideo(servers[0].url, res.body.video.id)
+      servers[0].video = resVideo.body
+    }
-    const video = videos.find(video => video.name === 'my super name')
+    {
-    expect(video.channel.name).to.equal('first_channel')
+      const attributes = { name: 'live', channelId: firstUserChannelId, privacy: VideoPrivacy.PUBLIC }
-    servers[0].video = video
+      const res = await createLive(servers[0].url, firstUserAccessToken, attributes)
+      liveId = res.body.video.id
+    }
    await doubleFollow(servers[0], servers[1])
  })
@@ -175,19 +208,19 @@ describe('Test video change ownership - nominal', function () {
  it('Should not be possible to accept the change of ownership from first user', async function () {
    this.timeout(10000)
-    const secondUserInformationResponse = await getMyUserInformation(servers[0].url, secondUserAccessToken)
+    await acceptChangeOwnership(
-    const secondUserInformation: User = secondUserInformationResponse.body
+      servers[0].url,
-    const channelId = secondUserInformation.videoChannels[0].id
+      firstUserAccessToken,
-    await acceptChangeOwnership(servers[0].url, firstUserAccessToken, lastRequestChangeOwnershipId, channelId, HttpStatusCode.FORBIDDEN_403)
+      lastRequestChangeOwnershipId,
+      secondUserChannelId,
+      HttpStatusCode.FORBIDDEN_403
+    )
  })
  it('Should be possible to accept the change of ownership from second user', async function () {
    this.timeout(10000)
-    const secondUserInformationResponse = await getMyUserInformation(servers[0].url, secondUserAccessToken)
+    await acceptChangeOwnership(servers[0].url, secondUserAccessToken, lastRequestChangeOwnershipId, secondUserChannelId)
-    const secondUserInformation: User = secondUserInformationResponse.body
-    const channelId = secondUserInformation.videoChannels[0].id
-    await acceptChangeOwnership(servers[0].url, secondUserAccessToken, lastRequestChangeOwnershipId, channelId)
    await waitJobs(servers)
  })
@@ -204,6 +237,37 @@ describe('Test video change ownership - nominal', function () {
    }
  })
+  it('Should send a request to change ownership of a live', async function () {
+    this.timeout(15000)
+    await changeVideoOwnership(servers[0].url, firstUserAccessToken, liveId, secondUser.username)
+    const resSecondUser = await getVideoChangeOwnershipList(servers[0].url, secondUserAccessToken)
+    expect(resSecondUser.body.total).to.equal(3)
+    expect(resSecondUser.body.data.length).to.equal(3)
+    lastRequestChangeOwnershipId = resSecondUser.body.data[0].id
+  })
+  it('Should accept a live ownership change', async function () {
+    this.timeout(20000)
+    await acceptChangeOwnership(servers[0].url, secondUserAccessToken, lastRequestChangeOwnershipId, secondUserChannelId)
+    await waitJobs(servers)
+    for (const server of servers) {
+      const res = await getVideo(server.url, servers[0].video.uuid)
+      const video: VideoDetails = res.body
+      expect(video.name).to.equal('my super name')
+      expect(video.channel.displayName).to.equal('Main second channel')
+      expect(video.channel.name).to.equal('second_channel')
+    }
+  })
  after(async function () {
    await cleanupTests(servers)
  })
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index 7e7ad028c..865098777 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -15,6 +15,7 @@ import {
  getVideoChannel,
  getVideoChannelVideos,
  setDefaultVideoChannel,
+  testFileExistsOrNot,
  testImage,
  updateVideo,
  updateVideoChannelImage,
@@ -53,6 +54,9 @@ describe('Test video channels', function () {
  let videoUUID: string
  let accountName: string
+  const avatarPaths: { [ port: number ]: string } = {}
+  const bannerPaths: { [ port: number ]: string } = {}
  before(async function () {
    this.timeout(60000)
@@ -287,9 +291,11 @@ describe('Test video channels', function () {
    for (const server of servers) {
      const videoChannel = await findChannel(server, secondVideoChannelId)
-      await testImage(server.url, 'avatar-resized', videoChannel.avatar.path, '.png')
+      avatarPaths[server.port] = videoChannel.avatar.path
+      await testImage(server.url, 'avatar-resized', avatarPaths[server.port], '.png')
+      await testFileExistsOrNot(server, 'avatars', basename(avatarPaths[server.port]), true)
-      const row = await getActorImage(server.internalServerNumber, basename(videoChannel.avatar.path))
+      const row = await getActorImage(server.internalServerNumber, basename(avatarPaths[server.port]))
      expect(row.height).to.equal(ACTOR_IMAGES_SIZE.AVATARS.height)
      expect(row.width).to.equal(ACTOR_IMAGES_SIZE.AVATARS.width)
    }
@@ -314,9 +320,11 @@ describe('Test video channels', function () {
      const res = await getVideoChannel(server.url, 'second_video_channel@' + servers[0].host)
      const videoChannel = res.body
-      await testImage(server.url, 'banner-resized', videoChannel.banner.path)
+      bannerPaths[server.port] = videoChannel.banner.path
+      await testImage(server.url, 'banner-resized', bannerPaths[server.port])
+      await testFileExistsOrNot(server, 'avatars', basename(bannerPaths[server.port]), true)
-      const row = await getActorImage(server.internalServerNumber, basename(videoChannel.banner.path))
+      const row = await getActorImage(server.internalServerNumber, basename(bannerPaths[server.port]))
      expect(row.height).to.equal(ACTOR_IMAGES_SIZE.BANNERS.height)
      expect(row.width).to.equal(ACTOR_IMAGES_SIZE.BANNERS.width)
    }
@@ -336,6 +344,7 @@ describe('Test video channels', function () {
    for (const server of servers) {
      const videoChannel = await findChannel(server, secondVideoChannelId)
+      await testFileExistsOrNot(server, 'avatars', basename(avatarPaths[server.port]), false)
      expect(videoChannel.avatar).to.be.null
    }
@@ -355,6 +364,7 @@ describe('Test video channels', function () {
    for (const server of servers) {
      const videoChannel = await findChannel(server, secondVideoChannelId)
+      await testFileExistsOrNot(server, 'avatars', basename(bannerPaths[server.port]), false)
      expect(videoChannel.banner).to.be.null
    }
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index 615e0ea45..b6b002307 100644
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -2,7 +2,7 @@
 import 'mocha'
 import * as chai from 'chai'
+import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '@shared/models'
 import { cleanupTests, testImage } from '../../../../shared/extra-utils'
 import {
  createUser,
@@ -22,7 +22,6 @@ import {
  getVideoCommentThreads,
  getVideoThreadComments
 } from '../../../../shared/extra-utils/videos/video-comments'
-import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
 const expect = chai.expect
@@ -232,7 +231,7 @@ describe('Test video comments', function () {
      expect(res.body.data[0].isDeleted).to.be.true
      expect(res.body.data[0].deletedAt).to.not.be.null
      expect(res.body.data[0].account).to.be.null
-      expect(res.body.data[0].totalReplies).to.equal(3)
+      expect(res.body.data[0].totalReplies).to.equal(2)
      expect(res.body.data[1].text).to.equal('super thread 2')
      expect(res.body.data[1].totalReplies).to.equal(0)
      expect(res.body.data[2].text).to.equal('super thread 3')
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts
index 9dad58c8c..da8de054b 100644
--- a/server/tests/api/videos/video-playlists.ts
+++ b/server/tests/api/videos/video-playlists.ts
@@ -56,7 +56,7 @@ import {
  removeServerFromServerBlocklist
 } from '../../../../shared/extra-utils/users/blocklist'
 import { User } from '../../../../shared/models/users'
-import { VideoPrivacy } from '../../../../shared/models/videos'
+import { VideoPlaylistCreateResult, VideoPrivacy } from '../../../../shared/models/videos'
 import { VideoExistInPlaylist } from '../../../../shared/models/videos/playlist/video-exist-in-playlist.model'
 import { VideoPlaylistElement, VideoPlaylistElementType } from '../../../../shared/models/videos/playlist/video-playlist-element.model'
 import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
@@ -427,31 +427,45 @@ describe('Test video playlists', function () {
        expect(data).to.have.lengthOf(0)
      }
    })
+  })
-    it('Should not list unlisted or private playlists', async function () {
+  describe('Playlist rights', function () {
+    let unlistedPlaylist: VideoPlaylistCreateResult
+    let privatePlaylist: VideoPlaylistCreateResult
+    before(async function () {
      this.timeout(30000)
-      await createVideoPlaylist({
+      {
-        url: servers[1].url,
+        const res = await createVideoPlaylist({
-        token: servers[1].accessToken,
+          url: servers[1].url,
-        playlistAttrs: {
+          token: servers[1].accessToken,
-          displayName: 'playlist unlisted',
+          playlistAttrs: {
-          privacy: VideoPlaylistPrivacy.UNLISTED
+            displayName: 'playlist unlisted',
-        }
+            privacy: VideoPlaylistPrivacy.UNLISTED,
-      })
+            videoChannelId: servers[1].videoChannel.id
+          }
+        })
+        unlistedPlaylist = res.body.videoPlaylist
+      }
-      await createVideoPlaylist({
+      {
-        url: servers[1].url,
+        const res = await createVideoPlaylist({
-        token: servers[1].accessToken,
+          url: servers[1].url,
-        playlistAttrs: {
+          token: servers[1].accessToken,
-          displayName: 'playlist private',
+          playlistAttrs: {
-          privacy: VideoPlaylistPrivacy.PRIVATE
+            displayName: 'playlist private',
-        }
+            privacy: VideoPlaylistPrivacy.PRIVATE
-      })
+          }
+        })
+        privatePlaylist = res.body.videoPlaylist
+      }
      await waitJobs(servers)
      await wait(3000)
+    })
+    it('Should not list unlisted or private playlists', async function () {
      for (const server of servers) {
        const results = [
          await getAccountPlaylistsList(server.url, 'root@localhost:' + servers[1].port, 0, 5, '-createdAt'),
@@ -469,6 +483,27 @@ describe('Test video playlists', function () {
        }
      }
    })
+    it('Should not get unlisted playlist using only the id', async function () {
+      await getVideoPlaylist(servers[1].url, unlistedPlaylist.id, 404)
+    })
+    it('Should get unlisted plyaylist using uuid or shortUUID', async function () {
+      await getVideoPlaylist(servers[1].url, unlistedPlaylist.uuid)
+      await getVideoPlaylist(servers[1].url, unlistedPlaylist.shortUUID)
+    })
+    it('Should not get private playlist without token', async function () {
+      for (const id of [ privatePlaylist.id, privatePlaylist.uuid, privatePlaylist.shortUUID ]) {
+        await getVideoPlaylist(servers[1].url, id, 401)
+      }
+    })
+    it('Should get private playlist with a token', async function () {
+      for (const id of [ privatePlaylist.id, privatePlaylist.uuid, privatePlaylist.shortUUID ]) {
+        await getVideoPlaylistWithToken(servers[1].url, servers[1].accessToken, id)
+      }
+    })
  })
  describe('Update playlists', function () {
diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts
index fed6ca0e0..950aeb7cf 100644
--- a/server/tests/api/videos/video-privacy.ts
+++ b/server/tests/api/videos/video-privacy.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import * as chai from 'chai'
 import 'mocha'
-import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
+import * as chai from 'chai'
+import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
+import { Video, VideoCreateResult } from '@shared/models'
 import {
  cleanupTests,
  flushAndRunServer,
@@ -13,12 +14,11 @@ import {
  uploadVideo
 } from '../../../../shared/extra-utils/index'
 import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
+import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import { userLogin } from '../../../../shared/extra-utils/users/login'
 import { createUser } from '../../../../shared/extra-utils/users/users'
 import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../../../shared/extra-utils/videos/videos'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
+import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
-import { Video } from '@shared/models'
-import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
@@ -32,7 +32,7 @@ describe('Test video privacy', function () {
  let internalVideoId: number
  let internalVideoUUID: string
-  let unlistedVideoUUID: string
+  let unlistedVideo: VideoCreateResult
  let nonFederatedUnlistedVideoUUID: string
  let now: number
@@ -59,231 +59,246 @@ describe('Test video privacy', function () {
    await doubleFollow(servers[0], servers[1])
  })
-  it('Should upload a private and internal videos on server 1', async function () {
+  describe('Private and internal videos', function () {
-    this.timeout(10000)
-    for (const privacy of [ VideoPrivacy.PRIVATE, VideoPrivacy.INTERNAL ]) {
+    it('Should upload a private and internal videos on server 1', async function () {
-      const attributes = { privacy }
+      this.timeout(10000)
-      await uploadVideo(servers[0].url, servers[0].accessToken, attributes)
-    }
-    await waitJobs(servers)
+      for (const privacy of [ VideoPrivacy.PRIVATE, VideoPrivacy.INTERNAL ]) {
-  })
+        const attributes = { privacy }
+        await uploadVideo(servers[0].url, servers[0].accessToken, attributes)
+      }
-  it('Should not have these private and internal videos on server 2', async function () {
+      await waitJobs(servers)
-    const res = await getVideosList(servers[1].url)
+    })
-    expect(res.body.total).to.equal(0)
+    it('Should not have these private and internal videos on server 2', async function () {
-    expect(res.body.data).to.have.lengthOf(0)
+      const res = await getVideosList(servers[1].url)
-  })
-  it('Should not list the private and internal videos for an unauthenticated user on server 1', async function () {
+      expect(res.body.total).to.equal(0)
-    const res = await getVideosList(servers[0].url)
+      expect(res.body.data).to.have.lengthOf(0)
+    })
-    expect(res.body.total).to.equal(0)
+    it('Should not list the private and internal videos for an unauthenticated user on server 1', async function () {
-    expect(res.body.data).to.have.lengthOf(0)
+      const res = await getVideosList(servers[0].url)
-  })
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.have.lengthOf(0)
+    })
-  it('Should not list the private video and list the internal video for an authenticated user on server 1', async function () {
+    it('Should not list the private video and list the internal video for an authenticated user on server 1', async function () {
-    const res = await getVideosListWithToken(servers[0].url, servers[0].accessToken)
+      const res = await getVideosListWithToken(servers[0].url, servers[0].accessToken)
-    expect(res.body.total).to.equal(1)
+      expect(res.body.total).to.equal(1)
-    expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data).to.have.lengthOf(1)
-    expect(res.body.data[0].privacy.id).to.equal(VideoPrivacy.INTERNAL)
+      expect(res.body.data[0].privacy.id).to.equal(VideoPrivacy.INTERNAL)
-  })
+    })
-  it('Should list my (private and internal) videos', async function () {
+    it('Should list my (private and internal) videos', async function () {
-    const res = await getMyVideos(servers[0].url, servers[0].accessToken, 0, 10)
+      const res = await getMyVideos(servers[0].url, servers[0].accessToken, 0, 10)
-    expect(res.body.total).to.equal(2)
+      expect(res.body.total).to.equal(2)
-    expect(res.body.data).to.have.lengthOf(2)
+      expect(res.body.data).to.have.lengthOf(2)
-    const videos: Video[] = res.body.data
+      const videos: Video[] = res.body.data
-    const privateVideo = videos.find(v => v.privacy.id === VideoPrivacy.PRIVATE)
+      const privateVideo = videos.find(v => v.privacy.id === VideoPrivacy.PRIVATE)
-    privateVideoId = privateVideo.id
+      privateVideoId = privateVideo.id
-    privateVideoUUID = privateVideo.uuid
+      privateVideoUUID = privateVideo.uuid
-    const internalVideo = videos.find(v => v.privacy.id === VideoPrivacy.INTERNAL)
+      const internalVideo = videos.find(v => v.privacy.id === VideoPrivacy.INTERNAL)
-    internalVideoId = internalVideo.id
+      internalVideoId = internalVideo.id
-    internalVideoUUID = internalVideo.uuid
+      internalVideoUUID = internalVideo.uuid
-  })
+    })
-  it('Should not be able to watch the private/internal video with non authenticated user', async function () {
+    it('Should not be able to watch the private/internal video with non authenticated user', async function () {
-    await getVideo(servers[0].url, privateVideoUUID, HttpStatusCode.UNAUTHORIZED_401)
+      await getVideo(servers[0].url, privateVideoUUID, HttpStatusCode.UNAUTHORIZED_401)
-    await getVideo(servers[0].url, internalVideoUUID, HttpStatusCode.UNAUTHORIZED_401)
+      await getVideo(servers[0].url, internalVideoUUID, HttpStatusCode.UNAUTHORIZED_401)
-  })
+    })
-  it('Should not be able to watch the private video with another user', async function () {
+    it('Should not be able to watch the private video with another user', async function () {
-    this.timeout(10000)
+      this.timeout(10000)
-    const user = {
+      const user = {
-      username: 'hello',
+        username: 'hello',
-      password: 'super password'
+        password: 'super password'
-    }
+      }
-    await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
+      await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
-    anotherUserToken = await userLogin(servers[0], user)
+      anotherUserToken = await userLogin(servers[0], user)
-    await getVideoWithToken(servers[0].url, anotherUserToken, privateVideoUUID, HttpStatusCode.FORBIDDEN_403)
+      await getVideoWithToken(servers[0].url, anotherUserToken, privateVideoUUID, HttpStatusCode.FORBIDDEN_403)
-  })
+    })
-  it('Should be able to watch the internal video with another user', async function () {
+    it('Should be able to watch the internal video with another user', async function () {
-    await getVideoWithToken(servers[0].url, anotherUserToken, internalVideoUUID, HttpStatusCode.OK_200)
+      await getVideoWithToken(servers[0].url, anotherUserToken, internalVideoUUID, HttpStatusCode.OK_200)
-  })
+    })
-  it('Should be able to watch the private video with the correct user', async function () {
+    it('Should be able to watch the private video with the correct user', async function () {
-    await getVideoWithToken(servers[0].url, servers[0].accessToken, privateVideoUUID, HttpStatusCode.OK_200)
+      await getVideoWithToken(servers[0].url, servers[0].accessToken, privateVideoUUID, HttpStatusCode.OK_200)
+    })
  })
-  it('Should upload an unlisted video on server 2', async function () {
+  describe('Unlisted videos', function () {
-    this.timeout(60000)
-    const attributes = {
+    it('Should upload an unlisted video on server 2', async function () {
-      name: 'unlisted video',
+      this.timeout(60000)
-      privacy: VideoPrivacy.UNLISTED
-    }
-    await uploadVideo(servers[1].url, servers[1].accessToken, attributes)
-    // Server 2 has transcoding enabled
+      const attributes = {
-    await waitJobs(servers)
+        name: 'unlisted video',
-  })
+        privacy: VideoPrivacy.UNLISTED
+      }
+      await uploadVideo(servers[1].url, servers[1].accessToken, attributes)
-  it('Should not have this unlisted video listed on server 1 and 2', async function () {
+      // Server 2 has transcoding enabled
-    for (const server of servers) {
+      await waitJobs(servers)
-      const res = await getVideosList(server.url)
+    })
-      expect(res.body.total).to.equal(0)
+    it('Should not have this unlisted video listed on server 1 and 2', async function () {
-      expect(res.body.data).to.have.lengthOf(0)
+      for (const server of servers) {
-    }
+        const res = await getVideosList(server.url)
-  })
-  it('Should list my (unlisted) videos', async function () {
+        expect(res.body.total).to.equal(0)
-    const res = await getMyVideos(servers[1].url, servers[1].accessToken, 0, 1)
+        expect(res.body.data).to.have.lengthOf(0)
+      }
+    })
-    expect(res.body.total).to.equal(1)
+    it('Should list my (unlisted) videos', async function () {
-    expect(res.body.data).to.have.lengthOf(1)
+      const res = await getMyVideos(servers[1].url, servers[1].accessToken, 0, 1)
-    unlistedVideoUUID = res.body.data[0].uuid
+      expect(res.body.total).to.equal(1)
-  })
+      expect(res.body.data).to.have.lengthOf(1)
-  it('Should be able to get this unlisted video', async function () {
+      unlistedVideo = res.body.data[0]
-    for (const server of servers) {
+    })
-      const res = await getVideo(server.url, unlistedVideoUUID)
-      expect(res.body.name).to.equal('unlisted video')
+    it('Should not be able to get this unlisted video using its id', async function () {
-    }
+      await getVideo(servers[1].url, unlistedVideo.id, 404)
-  })
+    })
-  it('Should upload a non-federating unlisted video to server 1', async function () {
+    it('Should be able to get this unlisted video using its uuid/shortUUID', async function () {
-    this.timeout(30000)
+      for (const server of servers) {
+        for (const id of [ unlistedVideo.uuid, unlistedVideo.shortUUID ]) {
+          const res = await getVideo(server.url, id)
-    const attributes = {
+          expect(res.body.name).to.equal('unlisted video')
-      name: 'unlisted video',
+        }
-      privacy: VideoPrivacy.UNLISTED
+      }
-    }
+    })
-    await uploadVideo(servers[0].url, servers[0].accessToken, attributes)
-    await waitJobs(servers)
+    it('Should upload a non-federating unlisted video to server 1', async function () {
-  })
+      this.timeout(30000)
+      const attributes = {
+        name: 'unlisted video',
+        privacy: VideoPrivacy.UNLISTED
+      }
+      await uploadVideo(servers[0].url, servers[0].accessToken, attributes)
-  it('Should list my new unlisted video', async function () {
+      await waitJobs(servers)
-    const res = await getMyVideos(servers[0].url, servers[0].accessToken, 0, 3)
+    })
-    expect(res.body.total).to.equal(3)
+    it('Should list my new unlisted video', async function () {
-    expect(res.body.data).to.have.lengthOf(3)
+      const res = await getMyVideos(servers[0].url, servers[0].accessToken, 0, 3)
-    nonFederatedUnlistedVideoUUID = res.body.data[0].uuid
+      expect(res.body.total).to.equal(3)
-  })
+      expect(res.body.data).to.have.lengthOf(3)
-  it('Should be able to get non-federated unlisted video from origin', async function () {
+      nonFederatedUnlistedVideoUUID = res.body.data[0].uuid
-    const res = await getVideo(servers[0].url, nonFederatedUnlistedVideoUUID)
+    })
-    expect(res.body.name).to.equal('unlisted video')
+    it('Should be able to get non-federated unlisted video from origin', async function () {
-  })
+      const res = await getVideo(servers[0].url, nonFederatedUnlistedVideoUUID)
-  it('Should not be able to get non-federated unlisted video from federated server', async function () {
+      expect(res.body.name).to.equal('unlisted video')
-    await getVideo(servers[1].url, nonFederatedUnlistedVideoUUID, HttpStatusCode.NOT_FOUND_404)
+    })
+    it('Should not be able to get non-federated unlisted video from federated server', async function () {
+      await getVideo(servers[1].url, nonFederatedUnlistedVideoUUID, HttpStatusCode.NOT_FOUND_404)
+    })
  })
-  it('Should update the private and internal videos to public on server 1', async function () {
+  describe('Privacy update', function () {
-    this.timeout(10000)
-    now = Date.now()
+    it('Should update the private and internal videos to public on server 1', async function () {
+      this.timeout(10000)
-    {
+      now = Date.now()
-      const attribute = {
-        name: 'private video becomes public',
-        privacy: VideoPrivacy.PUBLIC
-      }
-      await updateVideo(servers[0].url, servers[0].accessToken, privateVideoId, attribute)
+      {
-    }
+        const attribute = {
+          name: 'private video becomes public',
+          privacy: VideoPrivacy.PUBLIC
+        }
-    {
+        await updateVideo(servers[0].url, servers[0].accessToken, privateVideoId, attribute)
-      const attribute = {
-        name: 'internal video becomes public',
-        privacy: VideoPrivacy.PUBLIC
      }
-      await updateVideo(servers[0].url, servers[0].accessToken, internalVideoId, attribute)
-    }
-    await waitJobs(servers)
+      {
-  })
+        const attribute = {
+          name: 'internal video becomes public',
+          privacy: VideoPrivacy.PUBLIC
+        }
+        await updateVideo(servers[0].url, servers[0].accessToken, internalVideoId, attribute)
+      }
-  it('Should have this new public video listed on server 1 and 2', async function () {
+      await waitJobs(servers)
-    for (const server of servers) {
+    })
-      const res = await getVideosList(server.url)
-      expect(res.body.total).to.equal(2)
-      expect(res.body.data).to.have.lengthOf(2)
-      const videos: Video[] = res.body.data
+    it('Should have this new public video listed on server 1 and 2', async function () {
-      const privateVideo = videos.find(v => v.name === 'private video becomes public')
+      for (const server of servers) {
-      const internalVideo = videos.find(v => v.name === 'internal video becomes public')
+        const res = await getVideosList(server.url)
+        expect(res.body.total).to.equal(2)
+        expect(res.body.data).to.have.lengthOf(2)
-      expect(privateVideo).to.not.be.undefined
+        const videos: Video[] = res.body.data
-      expect(internalVideo).to.not.be.undefined
+        const privateVideo = videos.find(v => v.name === 'private video becomes public')
+        const internalVideo = videos.find(v => v.name === 'internal video becomes public')
-      expect(new Date(privateVideo.publishedAt).getTime()).to.be.at.least(now)
+        expect(privateVideo).to.not.be.undefined
-      // We don't change the publish date of internal videos
+        expect(internalVideo).to.not.be.undefined
-      expect(new Date(internalVideo.publishedAt).getTime()).to.be.below(now)
-      expect(privateVideo.privacy.id).to.equal(VideoPrivacy.PUBLIC)
+        expect(new Date(privateVideo.publishedAt).getTime()).to.be.at.least(now)
-      expect(internalVideo.privacy.id).to.equal(VideoPrivacy.PUBLIC)
+        // We don't change the publish date of internal videos
-    }
+        expect(new Date(internalVideo.publishedAt).getTime()).to.be.below(now)
-  })
-  it('Should set these videos as private and internal', async function () {
+        expect(privateVideo.privacy.id).to.equal(VideoPrivacy.PUBLIC)
-    this.timeout(10000)
+        expect(internalVideo.privacy.id).to.equal(VideoPrivacy.PUBLIC)
+      }
+    })
-    await updateVideo(servers[0].url, servers[0].accessToken, internalVideoId, { privacy: VideoPrivacy.PRIVATE })
+    it('Should set these videos as private and internal', async function () {
-    await updateVideo(servers[0].url, servers[0].accessToken, privateVideoId, { privacy: VideoPrivacy.INTERNAL })
+      this.timeout(10000)
-    await waitJobs(servers)
+      await updateVideo(servers[0].url, servers[0].accessToken, internalVideoId, { privacy: VideoPrivacy.PRIVATE })
+      await updateVideo(servers[0].url, servers[0].accessToken, privateVideoId, { privacy: VideoPrivacy.INTERNAL })
-    for (const server of servers) {
+      await waitJobs(servers)
-      const res = await getVideosList(server.url)
-      expect(res.body.total).to.equal(0)
+      for (const server of servers) {
-      expect(res.body.data).to.have.lengthOf(0)
+        const res = await getVideosList(server.url)
-    }
+        expect(res.body.total).to.equal(0)
+        expect(res.body.data).to.have.lengthOf(0)
+      }
-    {
+      {
-      const res = await getMyVideos(servers[0].url, servers[0].accessToken, 0, 5)
+        const res = await getMyVideos(servers[0].url, servers[0].accessToken, 0, 5)
-      const videos = res.body.data
+        const videos = res.body.data
-      expect(res.body.total).to.equal(3)
+        expect(res.body.total).to.equal(3)
-      expect(videos).to.have.lengthOf(3)
+        expect(videos).to.have.lengthOf(3)
-      const privateVideo = videos.find(v => v.name === 'private video becomes public')
+        const privateVideo = videos.find(v => v.name === 'private video becomes public')
-      const internalVideo = videos.find(v => v.name === 'internal video becomes public')
+        const internalVideo = videos.find(v => v.name === 'internal video becomes public')
-      expect(privateVideo).to.not.be.undefined
+        expect(privateVideo).to.not.be.undefined
-      expect(internalVideo).to.not.be.undefined
+        expect(internalVideo).to.not.be.undefined
-      expect(privateVideo.privacy.id).to.equal(VideoPrivacy.INTERNAL)
+        expect(privateVideo.privacy.id).to.equal(VideoPrivacy.INTERNAL)
-      expect(internalVideo.privacy.id).to.equal(VideoPrivacy.PRIVATE)
+        expect(internalVideo.privacy.id).to.equal(VideoPrivacy.PRIVATE)
-    }
+      }
+    })
  })
  after(async function () {
diff --git a/server/tests/api/videos/videos-filter.ts b/server/tests/api/videos/videos-filter.ts
index 2961c8e78..7428b82c5 100644
--- a/server/tests/api/videos/videos-filter.ts
+++ b/server/tests/api/videos/videos-filter.ts
@@ -47,13 +47,13 @@ async function getVideosNames (server: ServerInfo, token: string, filter: string
  return videosResults
 }
-describe('Test videos filter validator', function () {
+describe('Test videos filter', function () {
  let servers: ServerInfo[]
  // ---------------------------------------------------------------
  before(async function () {
-    this.timeout(120000)
+    this.timeout(160000)
    servers = await flushAndRunMultipleServers(2)
diff --git a/server/tests/api/videos/videos-overview.ts b/server/tests/api/videos/videos-overview.ts
index 7889bcf80..c266a1dc5 100644
--- a/server/tests/api/videos/videos-overview.ts
+++ b/server/tests/api/videos/videos-overview.ts
@@ -45,7 +45,7 @@ describe('Test a videos overview', function () {
  })
  it('Should upload 5 videos in a specific category, tag and channel but not include them in overview', async function () {
-    this.timeout(15000)
+    this.timeout(30000)
    await wait(3000)
@@ -61,7 +61,7 @@ describe('Test a videos overview', function () {
  })
  it('Should upload another video and include all videos in the overview', async function () {
-    this.timeout(15000)
+    this.timeout(30000)
    for (let i = 1; i < 6; i++) {
      await uploadVideo(server.url, server.accessToken, {
diff --git a/server/tests/cli/prune-storage.ts b/server/tests/cli/prune-storage.ts
index 591ed217f..a0af09de8 100644
--- a/server/tests/cli/prune-storage.ts
+++ b/server/tests/cli/prune-storage.ts
@@ -2,7 +2,10 @@
 import 'mocha'
 import * as chai from 'chai'
-import { waitJobs } from '../../../shared/extra-utils/server/jobs'
+import { createFile, readdir } from 'fs-extra'
+import { join } from 'path'
+import { buildUUID } from '@server/helpers/uuid'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 import {
  buildServerDirectory,
  cleanupTests,
@@ -12,6 +15,7 @@ import {
  flushAndRunMultipleServers,
  getAccount,
  getEnvCli,
+  killallServers,
  makeGetRequest,
  ServerInfo,
  setAccessTokensToServers,
@@ -20,11 +24,8 @@ import {
  uploadVideo,
  wait
 } from '../../../shared/extra-utils'
+import { waitJobs } from '../../../shared/extra-utils/server/jobs'
 import { Account, VideoPlaylistPrivacy } from '../../../shared/models'
-import { createFile, readdir } from 'fs-extra'
-import { v4 as uuidv4 } from 'uuid'
-import { join } from 'path'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
@@ -116,6 +117,9 @@ describe('Test prune storage scripts', function () {
    await wait(1000)
    await waitJobs(servers)
+    killallServers(servers)
+    await wait(1000)
  })
  it('Should have the files on the disk', async function () {
@@ -127,8 +131,8 @@ describe('Test prune storage scripts', function () {
      {
        const base = buildServerDirectory(servers[0], 'videos')
-        const n1 = uuidv4() + '.mp4'
+        const n1 = buildUUID() + '.mp4'
-        const n2 = uuidv4() + '.webm'
+        const n2 = buildUUID() + '.webm'
        await createFile(join(base, n1))
        await createFile(join(base, n2))
@@ -139,8 +143,8 @@ describe('Test prune storage scripts', function () {
      {
        const base = buildServerDirectory(servers[0], 'torrents')
-        const n1 = uuidv4() + '-240.torrent'
+        const n1 = buildUUID() + '-240.torrent'
-        const n2 = uuidv4() + '-480.torrent'
+        const n2 = buildUUID() + '-480.torrent'
        await createFile(join(base, n1))
        await createFile(join(base, n2))
@@ -151,8 +155,8 @@ describe('Test prune storage scripts', function () {
      {
        const base = buildServerDirectory(servers[0], 'thumbnails')
-        const n1 = uuidv4() + '.jpg'
+        const n1 = buildUUID() + '.jpg'
-        const n2 = uuidv4() + '.jpg'
+        const n2 = buildUUID() + '.jpg'
        await createFile(join(base, n1))
        await createFile(join(base, n2))
@@ -163,8 +167,8 @@ describe('Test prune storage scripts', function () {
      {
        const base = buildServerDirectory(servers[0], 'previews')
-        const n1 = uuidv4() + '.jpg'
+        const n1 = buildUUID() + '.jpg'
-        const n2 = uuidv4() + '.jpg'
+        const n2 = buildUUID() + '.jpg'
        await createFile(join(base, n1))
        await createFile(join(base, n2))
@@ -175,8 +179,8 @@ describe('Test prune storage scripts', function () {
      {
        const base = buildServerDirectory(servers[0], 'avatars')
-        const n1 = uuidv4() + '.png'
+        const n1 = buildUUID() + '.png'
-        const n2 = uuidv4() + '.jpg'
+        const n2 = buildUUID() + '.jpg'
        await createFile(join(base, n1))
        await createFile(join(base, n2))
diff --git a/server/tests/client.ts b/server/tests/client.ts
index 3c99bcd1f..7c4fb4e46 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -2,8 +2,9 @@
 import 'mocha'
 import * as chai from 'chai'
-import * as request from 'supertest'
+import { omit } from 'lodash'
-import { Account, VideoPlaylistPrivacy } from '@shared/models'
+import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
+import { Account, CustomConfig, HTMLServerConfig, ServerConfig, VideoPlaylistCreateResult, VideoPlaylistPrivacy } from '@shared/models'
 import {
  addVideoInPlaylist,
  cleanupTests,
@@ -11,8 +12,10 @@ import {
  doubleFollow,
  flushAndRunMultipleServers,
  getAccount,
+  getConfig,
  getCustomConfig,
  getVideosList,
+  makeGetRequest,
  makeHTMLRequest,
  ServerInfo,
  setAccessTokensToServers,
@@ -24,14 +27,16 @@ import {
  uploadVideo,
  waitJobs
 } from '../../shared/extra-utils'
-import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
 const expect = chai.expect
-function checkIndexTags (html: string, title: string, description: string, css: string) {
+function checkIndexTags (html: string, title: string, description: string, css: string, config: ServerConfig) {
  expect(html).to.contain('<title>' + title + '</title>')
  expect(html).to.contain('<meta name="description" content="' + description + '" />')
  expect(html).to.contain('<style class="custom-css-style">' + css + '</style>')
+  const htmlConfig: HTMLServerConfig = omit(config, 'signup')
+  expect(html).to.contain(`<script type="application/javascript">window.PeerTubeServerConfig = '${JSON.stringify(htmlConfig)}'</script>`)
 }
 describe('Test a client controllers', function () {
@@ -44,10 +49,16 @@ describe('Test a client controllers', function () {
  const playlistName = 'super playlist name'
  const playlistDescription = 'super playlist description'
-  let playlistUUID: string
+  let playlist: VideoPlaylistCreateResult
  const channelDescription = 'my super channel description'
+  const watchVideoBasePaths = [ '/videos/watch/', '/w/' ]
+  const watchPlaylistBasePaths = [ '/videos/watch/playlist/', '/w/p/' ]
+  let videoIds: (string | number)[] = []
+  let playlistIds: (string | number)[] = []
  before(async function () {
    this.timeout(120000)
@@ -70,7 +81,9 @@ describe('Test a client controllers', function () {
    const videos = resVideosRequest.body.data
    expect(videos.length).to.equal(1)
-    servers[0].video = videos[0]
+    const video = videos[0]
+    servers[0].video = video
+    videoIds = [ video.id, video.uuid, video.shortUUID ]
    // Playlist
@@ -82,16 +95,14 @@ describe('Test a client controllers', function () {
    }
    const resVideoPlaylistRequest = await createVideoPlaylist({ url: servers[0].url, token: servers[0].accessToken, playlistAttrs })
+    playlist = resVideoPlaylistRequest.body.videoPlaylist
-    const playlist = resVideoPlaylistRequest.body.videoPlaylist
+    playlistIds = [ playlist.id, playlist.shortUUID, playlist.uuid ]
-    const playlistId = playlist.id
-    playlistUUID = playlist.uuid
    await addVideoInPlaylist({
      url: servers[0].url,
      token: servers[0].accessToken,
-      playlistId,
+      playlistId: playlist.shortUUID,
-      elementAttrs: { videoId: servers[0].video.id }
+      elementAttrs: { videoId: video.id }
    })
    // Account
@@ -105,201 +116,277 @@ describe('Test a client controllers', function () {
  })
  describe('oEmbed', function () {
    it('Should have valid oEmbed discovery tags for videos', async function () {
-      const path = '/videos/watch/' + servers[0].video.uuid
+      for (const basePath of watchVideoBasePaths) {
-      const res = await request(servers[0].url)
+        for (const id of videoIds) {
-        .get(path)
+          const res = await makeGetRequest({
-        .set('Accept', 'text/html')
+            url: servers[0].url,
-        .expect(HttpStatusCode.OK_200)
+            path: basePath + id,
+            accept: 'text/html',
+            statusCodeExpected: HttpStatusCode.OK_200
+          })
+          const port = servers[0].port
+          const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
+            `url=http%3A%2F%2Flocalhost%3A${port}%2Fw%2F${servers[0].video.uuid}" ` +
+            `title="${servers[0].video.name}" />`
+          expect(res.text).to.contain(expectedLink)
+        }
+      }
+    })
-      const port = servers[0].port
+    it('Should have valid oEmbed discovery tags for a playlist', async function () {
+      for (const basePath of watchPlaylistBasePaths) {
+        for (const id of playlistIds) {
+          const res = await makeGetRequest({
+            url: servers[0].url,
+            path: basePath + id,
+            accept: 'text/html',
+            statusCodeExpected: HttpStatusCode.OK_200
+          })
+          const port = servers[0].port
+          const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
+            `url=http%3A%2F%2Flocalhost%3A${port}%2Fw%2Fp%2F${playlist.uuid}" ` +
+            `title="${playlistName}" />`
+          expect(res.text).to.contain(expectedLink)
+        }
+      }
+    })
+  })
-      const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
+  describe('Open Graph', function () {
-        `url=http%3A%2F%2Flocalhost%3A${port}%2Fvideos%2Fwatch%2F${servers[0].video.uuid}" ` +
-        `title="${servers[0].video.name}" />`
-      expect(res.text).to.contain(expectedLink)
+    async function accountPageTest (path: string) {
-    })
+      const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+      const text = res.text
-    it('Should have valid oEmbed discovery tags for a playlist', async function () {
+      expect(text).to.contain(`<meta property="og:title" content="${account.displayName}" />`)
-      const res = await request(servers[0].url)
+      expect(text).to.contain(`<meta property="og:description" content="${account.description}" />`)
-        .get('/videos/watch/playlist/' + playlistUUID)
+      expect(text).to.contain('<meta property="og:type" content="website" />')
-        .set('Accept', 'text/html')
+      expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/accounts/${servers[0].user.username}" />`)
-        .expect(HttpStatusCode.OK_200)
+    }
-      const port = servers[0].port
+    async function channelPageTest (path: string) {
+      const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+      const text = res.text
-      const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:' + port + '/services/oembed?' +
+      expect(text).to.contain(`<meta property="og:title" content="${servers[0].videoChannel.displayName}" />`)
-        `url=http%3A%2F%2Flocalhost%3A${port}%2Fvideos%2Fwatch%2Fplaylist%2F${playlistUUID}" ` +
+      expect(text).to.contain(`<meta property="og:description" content="${channelDescription}" />`)
-        `title="${playlistName}" />`
+      expect(text).to.contain('<meta property="og:type" content="website" />')
+      expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/video-channels/${servers[0].videoChannel.name}" />`)
+    }
-      expect(res.text).to.contain(expectedLink)
+    async function watchVideoPageTest (path: string) {
-    })
+      const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
-  })
+      const text = res.text
-  describe('Open Graph', function () {
+      expect(text).to.contain(`<meta property="og:title" content="${videoName}" />`)
+      expect(text).to.contain(`<meta property="og:description" content="${videoDescriptionPlainText}" />`)
+      expect(text).to.contain('<meta property="og:type" content="video" />')
+      expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/w/${servers[0].video.uuid}" />`)
+    }
+    async function watchPlaylistPageTest (path: string) {
+      const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+      const text = res.text
+      expect(text).to.contain(`<meta property="og:title" content="${playlistName}" />`)
+      expect(text).to.contain(`<meta property="og:description" content="${playlistDescription}" />`)
+      expect(text).to.contain('<meta property="og:type" content="video" />')
+      expect(text).to.contain(`<meta property="og:url" content="${servers[0].url}/w/p/${playlist.uuid}" />`)
+    }
    it('Should have valid Open Graph tags on the account page', async function () {
-      const res = await request(servers[0].url)
+      await accountPageTest('/accounts/' + servers[0].user.username)
-        .get('/accounts/' + servers[0].user.username)
+      await accountPageTest('/a/' + servers[0].user.username)
-        .set('Accept', 'text/html')
+      await accountPageTest('/@' + servers[0].user.username)
-        .expect(HttpStatusCode.OK_200)
-      expect(res.text).to.contain(`<meta property="og:title" content="${account.displayName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${account.description}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="website" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/accounts/${servers[0].user.username}" />`)
    })
    it('Should have valid Open Graph tags on the channel page', async function () {
-      const res = await request(servers[0].url)
+      await channelPageTest('/video-channels/' + servers[0].videoChannel.name)
-        .get('/video-channels/' + servers[0].videoChannel.name)
+      await channelPageTest('/c/' + servers[0].videoChannel.name)
-        .set('Accept', 'text/html')
+      await channelPageTest('/@' + servers[0].videoChannel.name)
-        .expect(HttpStatusCode.OK_200)
-      expect(res.text).to.contain(`<meta property="og:title" content="${servers[0].videoChannel.displayName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${channelDescription}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="website" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/video-channels/${servers[0].videoChannel.name}" />`)
    })
-    it('Should have valid Open Graph tags on the watch page with video id', async function () {
+    it('Should have valid Open Graph tags on the watch page', async function () {
-      const res = await request(servers[0].url)
+      for (const path of watchVideoBasePaths) {
-        .get('/videos/watch/' + servers[0].video.id)
+        for (const id of videoIds) {
-        .set('Accept', 'text/html')
+          await watchVideoPageTest(path + id)
-        .expect(HttpStatusCode.OK_200)
+        }
+      }
-      expect(res.text).to.contain(`<meta property="og:title" content="${videoName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${videoDescriptionPlainText}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="video" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/videos/watch/${servers[0].video.uuid}" />`)
-    })
-    it('Should have valid Open Graph tags on the watch page with video uuid', async function () {
-      const res = await request(servers[0].url)
-        .get('/videos/watch/' + servers[0].video.uuid)
-        .set('Accept', 'text/html')
-        .expect(HttpStatusCode.OK_200)
-      expect(res.text).to.contain(`<meta property="og:title" content="${videoName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${videoDescriptionPlainText}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="video" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/videos/watch/${servers[0].video.uuid}" />`)
    })
    it('Should have valid Open Graph tags on the watch playlist page', async function () {
-      const res = await request(servers[0].url)
+      for (const path of watchPlaylistBasePaths) {
-        .get('/videos/watch/playlist/' + playlistUUID)
+        for (const id of playlistIds) {
-        .set('Accept', 'text/html')
+          await watchPlaylistPageTest(path + id)
-        .expect(HttpStatusCode.OK_200)
+        }
+      }
-      expect(res.text).to.contain(`<meta property="og:title" content="${playlistName}" />`)
-      expect(res.text).to.contain(`<meta property="og:description" content="${playlistDescription}" />`)
-      expect(res.text).to.contain('<meta property="og:type" content="video" />')
-      expect(res.text).to.contain(`<meta property="og:url" content="${servers[0].url}/videos/watch/playlist/${playlistUUID}" />`)
    })
  })
  describe('Twitter card', async function () {
-    it('Should have valid twitter card on the watch video page', async function () {
+    describe('Not whitelisted', function () {
-      const res = await request(servers[0].url)
-        .get('/videos/watch/' + servers[0].video.uuid)
-        .set('Accept', 'text/html')
-        .expect(HttpStatusCode.OK_200)
-      expect(res.text).to.contain('<meta property="twitter:card" content="summary_large_image" />')
+      async function accountPageTest (path: string) {
-      expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
-      expect(res.text).to.contain(`<meta property="twitter:title" content="${videoName}" />`)
+        const text = res.text
-      expect(res.text).to.contain(`<meta property="twitter:description" content="${videoDescriptionPlainText}" />`)
-    })
-    it('Should have valid twitter card on the watch playlist page', async function () {
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
-      const res = await request(servers[0].url)
+        expect(text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
-        .get('/videos/watch/playlist/' + playlistUUID)
+        expect(text).to.contain(`<meta property="twitter:title" content="${account.name}" />`)
-        .set('Accept', 'text/html')
+        expect(text).to.contain(`<meta property="twitter:description" content="${account.description}" />`)
-        .expect(HttpStatusCode.OK_200)
+      }
-      expect(res.text).to.contain('<meta property="twitter:card" content="summary" />')
+      async function channelPageTest (path: string) {
-      expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
-      expect(res.text).to.contain(`<meta property="twitter:title" content="${playlistName}" />`)
+        const text = res.text
-      expect(res.text).to.contain(`<meta property="twitter:description" content="${playlistDescription}" />`)
-    })
-    it('Should have valid twitter card on the account page', async function () {
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
-      const res = await request(servers[0].url)
+        expect(text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
-        .get('/accounts/' + account.name)
+        expect(text).to.contain(`<meta property="twitter:title" content="${servers[0].videoChannel.displayName}" />`)
-        .set('Accept', 'text/html')
+        expect(text).to.contain(`<meta property="twitter:description" content="${channelDescription}" />`)
-        .expect(HttpStatusCode.OK_200)
+      }
-      expect(res.text).to.contain('<meta property="twitter:card" content="summary" />')
+      async function watchVideoPageTest (path: string) {
-      expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
-      expect(res.text).to.contain(`<meta property="twitter:title" content="${account.name}" />`)
+        const text = res.text
-      expect(res.text).to.contain(`<meta property="twitter:description" content="${account.description}" />`)
-    })
+        expect(text).to.contain('<meta property="twitter:card" content="summary_large_image" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        expect(text).to.contain(`<meta property="twitter:title" content="${videoName}" />`)
+        expect(text).to.contain(`<meta property="twitter:description" content="${videoDescriptionPlainText}" />`)
+      }
-    it('Should have valid twitter card on the channel page', async function () {
+      async function watchPlaylistPageTest (path: string) {
-      const res = await request(servers[0].url)
+        const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
-        .get('/video-channels/' + servers[0].videoChannel.name)
+        const text = res.text
-        .set('Accept', 'text/html')
-        .expect(HttpStatusCode.OK_200)
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        expect(text).to.contain(`<meta property="twitter:title" content="${playlistName}" />`)
+        expect(text).to.contain(`<meta property="twitter:description" content="${playlistDescription}" />`)
+      }
-      expect(res.text).to.contain('<meta property="twitter:card" content="summary" />')
+      it('Should have valid twitter card on the watch video page', async function () {
-      expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+        for (const path of watchVideoBasePaths) {
-      expect(res.text).to.contain(`<meta property="twitter:title" content="${servers[0].videoChannel.displayName}" />`)
+          for (const id of videoIds) {
-      expect(res.text).to.contain(`<meta property="twitter:description" content="${channelDescription}" />`)
+            await watchVideoPageTest(path + id)
+          }
+        }
+      })
+      it('Should have valid twitter card on the watch playlist page', async function () {
+        for (const path of watchPlaylistBasePaths) {
+          for (const id of playlistIds) {
+            await watchPlaylistPageTest(path + id)
+          }
+        }
+      })
+      it('Should have valid twitter card on the account page', async function () {
+        await accountPageTest('/accounts/' + account.name)
+        await accountPageTest('/a/' + account.name)
+        await accountPageTest('/@' + account.name)
+      })
+      it('Should have valid twitter card on the channel page', async function () {
+        await channelPageTest('/video-channels/' + servers[0].videoChannel.name)
+        await channelPageTest('/c/' + servers[0].videoChannel.name)
+        await channelPageTest('/@' + servers[0].videoChannel.name)
+      })
    })
-    it('Should have valid twitter card if Twitter is whitelisted', async function () {
+    describe('Whitelisted', function () {
-      const res1 = await getCustomConfig(servers[0].url, servers[0].accessToken)
-      const config = res1.body
+      before(async function () {
-      config.services.twitter = {
+        const res = await getCustomConfig(servers[0].url, servers[0].accessToken)
-        username: '@Kuja',
+        const config = res.body as CustomConfig
-        whitelisted: true
+        config.services.twitter = {
+          username: '@Kuja',
+          whitelisted: true
+        }
+        await updateCustomConfig(servers[0].url, servers[0].accessToken, config)
+      })
+      async function accountPageTest (path: string) {
+        const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
+        const text = res.text
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
      }
-      await updateCustomConfig(servers[0].url, servers[0].accessToken, config)
-      const resVideoRequest = await request(servers[0].url)
+      async function channelPageTest (path: string) {
-        .get('/videos/watch/' + servers[0].video.uuid)
+        const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
-        .set('Accept', 'text/html')
+        const text = res.text
-        .expect(HttpStatusCode.OK_200)
-      expect(resVideoRequest.text).to.contain('<meta property="twitter:card" content="player" />')
+        expect(text).to.contain('<meta property="twitter:card" content="summary" />')
-      expect(resVideoRequest.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      }
-      const resVideoPlaylistRequest = await request(servers[0].url)
+      async function watchVideoPageTest (path: string) {
-        .get('/videos/watch/playlist/' + playlistUUID)
+        const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
-        .set('Accept', 'text/html')
+        const text = res.text
-        .expect(HttpStatusCode.OK_200)
-      expect(resVideoPlaylistRequest.text).to.contain('<meta property="twitter:card" content="player" />')
+        expect(text).to.contain('<meta property="twitter:card" content="player" />')
-      expect(resVideoPlaylistRequest.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      }
-      const resAccountRequest = await request(servers[0].url)
+      async function watchPlaylistPageTest (path: string) {
-        .get('/accounts/' + account.name)
+        const res = await makeGetRequest({ url: servers[0].url, path, accept: 'text/html', statusCodeExpected: HttpStatusCode.OK_200 })
-        .set('Accept', 'text/html')
+        const text = res.text
-        .expect(HttpStatusCode.OK_200)
-      expect(resAccountRequest.text).to.contain('<meta property="twitter:card" content="summary" />')
+        expect(text).to.contain('<meta property="twitter:card" content="player" />')
-      expect(resAccountRequest.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+        expect(text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+      }
-      const resChannelRequest = await request(servers[0].url)
+      it('Should have valid twitter card on the watch video page', async function () {
-        .get('/video-channels/' + servers[0].videoChannel.name)
+        for (const path of watchVideoBasePaths) {
-        .set('Accept', 'text/html')
+          for (const id of videoIds) {
-        .expect(HttpStatusCode.OK_200)
+            await watchVideoPageTest(path + id)
+          }
+        }
+      })
+      it('Should have valid twitter card on the watch playlist page', async function () {
+        for (const path of watchPlaylistBasePaths) {
+          for (const id of playlistIds) {
+            await watchPlaylistPageTest(path + id)
+          }
+        }
+      })
-      expect(resChannelRequest.text).to.contain('<meta property="twitter:card" content="summary" />')
+      it('Should have valid twitter card on the account page', async function () {
-      expect(resChannelRequest.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+        await accountPageTest('/accounts/' + account.name)
+        await accountPageTest('/a/' + account.name)
+        await accountPageTest('/@' + account.name)
+      })
+      it('Should have valid twitter card on the channel page', async function () {
+        await channelPageTest('/video-channels/' + servers[0].videoChannel.name)
+        await channelPageTest('/c/' + servers[0].videoChannel.name)
+        await channelPageTest('/@' + servers[0].videoChannel.name)
+      })
    })
  })
  describe('Index HTML', function () {
    it('Should have valid index html tags (title, description...)', async function () {
+      const resConfig = await getConfig(servers[0].url)
      const res = await makeHTMLRequest(servers[0].url, '/videos/trending')
      const description = 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
-      checkIndexTags(res.text, 'PeerTube', description, '')
+      checkIndexTags(res.text, 'PeerTube', description, '', resConfig.body)
    })
    it('Should update the customized configuration and have the correct index html tags', async function () {
@@ -318,35 +405,65 @@ describe('Test a client controllers', function () {
        }
      })
+      const resConfig = await getConfig(servers[0].url)
      const res = await makeHTMLRequest(servers[0].url, '/videos/trending')
-      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
+      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }', resConfig.body)
    })
    it('Should have valid index html updated tags (title, description...)', async function () {
+      const resConfig = await getConfig(servers[0].url)
      const res = await makeHTMLRequest(servers[0].url, '/videos/trending')
-      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
+      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }', resConfig.body)
    })
    it('Should use the original video URL for the canonical tag', async function () {
-      const res = await makeHTMLRequest(servers[1].url, '/videos/watch/' + servers[0].video.uuid)
+      for (const basePath of watchVideoBasePaths) {
-      expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/videos/watch/${servers[0].video.uuid}" />`)
+        for (const id of videoIds) {
+          const res = await makeHTMLRequest(servers[1].url, basePath + id)
+          expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/videos/watch/${servers[0].video.uuid}" />`)
+        }
+      }
    })
    it('Should use the original account URL for the canonical tag', async function () {
-      const res = await makeHTMLRequest(servers[1].url, '/accounts/root@' + servers[0].host)
+      const accountURLtest = (res) => {
-      expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/accounts/root" />`)
+        expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/accounts/root" />`)
+      }
+      accountURLtest(await makeHTMLRequest(servers[1].url, '/accounts/root@' + servers[0].host))
+      accountURLtest(await makeHTMLRequest(servers[1].url, '/a/root@' + servers[0].host))
+      accountURLtest(await makeHTMLRequest(servers[1].url, '/@root@' + servers[0].host))
    })
    it('Should use the original channel URL for the canonical tag', async function () {
-      const res = await makeHTMLRequest(servers[1].url, '/video-channels/root_channel@' + servers[0].host)
+      const channelURLtests = (res) => {
-      expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/video-channels/root_channel" />`)
+        expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/video-channels/root_channel" />`)
+      }
+      channelURLtests(await makeHTMLRequest(servers[1].url, '/video-channels/root_channel@' + servers[0].host))
+      channelURLtests(await makeHTMLRequest(servers[1].url, '/c/root_channel@' + servers[0].host))
+      channelURLtests(await makeHTMLRequest(servers[1].url, '/@root_channel@' + servers[0].host))
    })
    it('Should use the original playlist URL for the canonical tag', async function () {
-      const res = await makeHTMLRequest(servers[1].url, '/videos/watch/playlist/' + playlistUUID)
+      for (const basePath of watchPlaylistBasePaths) {
-      expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/video-playlists/${playlistUUID}" />`)
+        for (const id of playlistIds) {
+          const res = await makeHTMLRequest(servers[1].url, basePath + id)
+          expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/video-playlists/${playlist.uuid}" />`)
+        }
+      }
+    })
+  })
+  describe('Embed HTML', function () {
+    it('Should have the correct embed html tags', async function () {
+      const resConfig = await getConfig(servers[0].url)
+      const res = await makeHTMLRequest(servers[0].url, servers[0].video.embedPath)
+      checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }', resConfig.body)
    })
  })
diff --git a/server/tests/external-plugins/auto-block-videos.ts b/server/tests/external-plugins/auto-block-videos.ts
index 1b91d141e..18ea17d78 100644
--- a/server/tests/external-plugins/auto-block-videos.ts
+++ b/server/tests/external-plugins/auto-block-videos.ts
@@ -40,6 +40,7 @@ describe('Official plugin auto-block videos', function () {
  let blocklistServer: MockBlocklist
  let server1Videos: Video[] = []
  let server2Videos: Video[] = []
+  let port: number
  before(async function () {
    this.timeout(60000)
@@ -56,7 +57,7 @@ describe('Official plugin auto-block videos', function () {
    }
    blocklistServer = new MockBlocklist()
-    await blocklistServer.initialize()
+    port = await blocklistServer.initialize()
    await uploadVideoAndGetId({ server: servers[0], videoName: 'video server 1' })
    await uploadVideoAndGetId({ server: servers[1], videoName: 'video server 2' })
@@ -82,7 +83,7 @@ describe('Official plugin auto-block videos', function () {
      accessToken: servers[0].accessToken,
      npmName: 'peertube-plugin-auto-block-videos',
      settings: {
-        'blocklist-urls': 'http://localhost:42100/blocklist',
+        'blocklist-urls': `http://localhost:${port}/blocklist`,
        'check-seconds-interval': 1
      }
    })
diff --git a/server/tests/external-plugins/auto-mute.ts b/server/tests/external-plugins/auto-mute.ts
index 687f56e98..09355d932 100644
--- a/server/tests/external-plugins/auto-mute.ts
+++ b/server/tests/external-plugins/auto-mute.ts
@@ -31,6 +31,7 @@ describe('Official plugin auto-mute', function () {
  const autoMuteListPath = '/plugins/auto-mute/router/api/v1/mute-list'
  let servers: ServerInfo[]
  let blocklistServer: MockBlocklist
+  let port: number
  before(async function () {
    this.timeout(30000)
@@ -47,7 +48,7 @@ describe('Official plugin auto-mute', function () {
    }
    blocklistServer = new MockBlocklist()
-    await blocklistServer.initialize()
+    port = await blocklistServer.initialize()
    await uploadVideoAndGetId({ server: servers[0], videoName: 'video server 1' })
    await uploadVideoAndGetId({ server: servers[1], videoName: 'video server 2' })
@@ -61,7 +62,7 @@ describe('Official plugin auto-mute', function () {
      accessToken: servers[0].accessToken,
      npmName: 'peertube-plugin-auto-mute',
      settings: {
-        'blocklist-urls': 'http://localhost:42100/blocklist',
+        'blocklist-urls': `http://localhost:${port}/blocklist`,
        'check-seconds-interval': 1
      }
    })
diff --git a/server/tests/api/activitypub/json/mastodon/bad-body-http-signature.json b/server/tests/fixtures/ap-json/mastodon/bad-body-http-signature.json
index 4e7bc3af5..4e7bc3af5 100644
--- a/server/tests/api/activitypub/json/mastodon/bad-body-http-signature.json
+++ b/server/tests/fixtures/ap-json/mastodon/bad-body-http-signature.json
diff --git a/server/tests/api/activitypub/json/mastodon/bad-http-signature.json b/server/tests/fixtures/ap-json/mastodon/bad-http-signature.json
index 098597db0..098597db0 100644
--- a/server/tests/api/activitypub/json/mastodon/bad-http-signature.json
+++ b/server/tests/fixtures/ap-json/mastodon/bad-http-signature.json
diff --git a/server/tests/api/activitypub/json/mastodon/bad-public-key.json b/server/tests/fixtures/ap-json/mastodon/bad-public-key.json
index 73d18b3ad..73d18b3ad 100644
--- a/server/tests/api/activitypub/json/mastodon/bad-public-key.json
+++ b/server/tests/fixtures/ap-json/mastodon/bad-public-key.json
diff --git a/server/tests/api/activitypub/json/mastodon/create-bad-signature.json b/server/tests/fixtures/ap-json/mastodon/create-bad-signature.json
index 2cd037241..2cd037241 100644
--- a/server/tests/api/activitypub/json/mastodon/create-bad-signature.json
+++ b/server/tests/fixtures/ap-json/mastodon/create-bad-signature.json
diff --git a/server/tests/api/activitypub/json/mastodon/create.json b/server/tests/fixtures/ap-json/mastodon/create.json
index 0be271bb8..0be271bb8 100644
--- a/server/tests/api/activitypub/json/mastodon/create.json
+++ b/server/tests/fixtures/ap-json/mastodon/create.json
diff --git a/server/tests/api/activitypub/json/mastodon/http-signature.json b/server/tests/fixtures/ap-json/mastodon/http-signature.json
index 4e7bc3af5..4e7bc3af5 100644
--- a/server/tests/api/activitypub/json/mastodon/http-signature.json
+++ b/server/tests/fixtures/ap-json/mastodon/http-signature.json
diff --git a/server/tests/api/activitypub/json/mastodon/public-key.json b/server/tests/fixtures/ap-json/mastodon/public-key.json
index b7b9b8308..b7b9b8308 100644
--- a/server/tests/api/activitypub/json/mastodon/public-key.json
+++ b/server/tests/fixtures/ap-json/mastodon/public-key.json
diff --git a/server/tests/api/activitypub/json/peertube/announce-without-context.json b/server/tests/fixtures/ap-json/peertube/announce-without-context.json
index 5f2af0cde..5f2af0cde 100644
--- a/server/tests/api/activitypub/json/peertube/announce-without-context.json
+++ b/server/tests/fixtures/ap-json/peertube/announce-without-context.json
diff --git a/server/tests/api/activitypub/json/peertube/invalid-keys.json b/server/tests/fixtures/ap-json/peertube/invalid-keys.json
index 0544e96b9..0544e96b9 100644
--- a/server/tests/api/activitypub/json/peertube/invalid-keys.json
+++ b/server/tests/fixtures/ap-json/peertube/invalid-keys.json
diff --git a/server/tests/api/activitypub/json/peertube/keys.json b/server/tests/fixtures/ap-json/peertube/keys.json
index 1a7700865..1a7700865 100644
--- a/server/tests/api/activitypub/json/peertube/keys.json
+++ b/server/tests/fixtures/ap-json/peertube/keys.json
diff --git a/server/tests/fixtures/peertube-plugin-test-broken/main.js b/server/tests/fixtures/peertube-plugin-test-broken/main.js
new file mode 100644
index 000000000..afdb6f7a0
--- /dev/null
+++ b/server/tests/fixtures/peertube-plugin-test-broken/main.js
@@ -0,0 +1,12 @@
+async function register (options) {
+  options.unknownFunction()
+}
+async function unregister () {
+  return
+}
+module.exports = {
+  register,
+  unregister
+}
diff --git a/server/tests/fixtures/peertube-plugin-test-three/package.json b/server/tests/fixtures/peertube-plugin-test-broken/package.json
index 41d4c93fe..fd03df216 100644
--- a/server/tests/fixtures/peertube-plugin-test-three/package.json
+++ b/server/tests/fixtures/peertube-plugin-test-broken/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "peertube-plugin-test-three",
+  "name": "peertube-plugin-test-broken",
  "version": "0.0.1",
-  "description": "Plugin test 3",
+  "description": "Plugin test broken",
  "engine": {
    "peertube": ">=1.3.0"
  },
diff --git a/server/tests/fixtures/peertube-plugin-test-two/languages/fr.json b/server/tests/fixtures/peertube-plugin-test-filter-translations/languages/fr.json
index 52d8313df..52d8313df 100644
--- a/server/tests/fixtures/peertube-plugin-test-two/languages/fr.json
+++ b/server/tests/fixtures/peertube-plugin-test-filter-translations/languages/fr.json
diff --git a/server/tests/fixtures/peertube-plugin-test-two/languages/it.json b/server/tests/fixtures/peertube-plugin-test-filter-translations/languages/it.json
index 9e187d83b..9e187d83b 100644
--- a/server/tests/fixtures/peertube-plugin-test-two/languages/it.json
+++ b/server/tests/fixtures/peertube-plugin-test-filter-translations/languages/it.json
diff --git a/server/tests/fixtures/peertube-plugin-test-two/main.js b/server/tests/fixtures/peertube-plugin-test-filter-translations/main.js
index 71c11b2ba..71c11b2ba 100644
--- a/server/tests/fixtures/peertube-plugin-test-two/main.js
+++ b/server/tests/fixtures/peertube-plugin-test-filter-translations/main.js
diff --git a/server/tests/fixtures/peertube-plugin-test-two/package.json b/server/tests/fixtures/peertube-plugin-test-filter-translations/package.json
index 926f2d69b..2adce4743 100644
--- a/server/tests/fixtures/peertube-plugin-test-two/package.json
+++ b/server/tests/fixtures/peertube-plugin-test-filter-translations/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "peertube-plugin-test-two",
+  "name": "peertube-plugin-test-filter-translations",
  "version": "0.0.1",
-  "description": "Plugin test 2",
+  "description": "Plugin test filter and translations",
  "engine": {
    "peertube": ">=1.3.0"
  },
diff --git a/server/tests/fixtures/peertube-plugin-test-three/main.js b/server/tests/fixtures/peertube-plugin-test-video-constants/main.js
index f2b89bcf0..3e650e0a1 100644
--- a/server/tests/fixtures/peertube-plugin-test-three/main.js
+++ b/server/tests/fixtures/peertube-plugin-test-video-constants/main.js
@@ -11,8 +11,10 @@ async function register ({
 }) {
  videoLanguageManager.addLanguage('al_bhed', 'Al Bhed')
  videoLanguageManager.addLanguage('al_bhed2', 'Al Bhed 2')
+  videoLanguageManager.addLanguage('al_bhed3', 'Al Bhed 3')
  videoLanguageManager.deleteLanguage('en')
  videoLanguageManager.deleteLanguage('fr')
+  videoLanguageManager.deleteLanguage('al_bhed3')
  videoCategoryManager.addCategory(42, 'Best category')
  videoCategoryManager.addCategory(43, 'High best category')
diff --git a/server/tests/fixtures/peertube-plugin-test-video-constants/package.json b/server/tests/fixtures/peertube-plugin-test-video-constants/package.json
new file mode 100644
index 000000000..0fcf39933
--- /dev/null
+++ b/server/tests/fixtures/peertube-plugin-test-video-constants/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "peertube-plugin-test-video-constants",
+  "version": "0.0.1",
+  "description": "Plugin test video constants",
+  "engine": {
+    "peertube": ">=1.3.0"
+  },
+  "keywords": [
+    "peertube",
+    "plugin"
+  ],
+  "homepage": "https://github.com/Chocobozzz/PeerTube",
+  "author": "Chocobozzz",
+  "bugs": "https://github.com/Chocobozzz/PeerTube/issues",
+  "library": "./main.js",
+  "staticDirs": {},
+  "css": [],
+  "clientScripts": [],
+  "translations": {}
+}
diff --git a/server/tests/fixtures/peertube-plugin-test/main.js b/server/tests/fixtures/peertube-plugin-test/main.js
index ee0bc39f3..f8e6f0b98 100644
--- a/server/tests/fixtures/peertube-plugin-test/main.js
+++ b/server/tests/fixtures/peertube-plugin-test/main.js
@@ -19,7 +19,9 @@ async function register ({ registerHook, registerSetting, settingsManager, stora
    'action:api.user.created',
    'action:api.user.deleted',
    'action:api.user.updated',
-    'action:api.user.oauth2-got-token'
+    'action:api.user.oauth2-got-token',
+    'action:api.video-playlist-element.created'
  ]
  for (const h of actionHooks) {
@@ -241,6 +243,10 @@ async function register ({ registerHook, registerSetting, settingsManager, stora
      'filter:api.search.video-channels.local.list.result',
      'filter:api.search.video-channels.index.list.params',
      'filter:api.search.video-channels.index.list.result',
+      'filter:api.search.video-playlists.local.list.params',
+      'filter:api.search.video-playlists.local.list.result',
+      'filter:api.search.video-playlists.index.list.params',
+      'filter:api.search.video-playlists.index.list.result'
    ]
    for (const h of searchHooks) {
diff --git a/server/tests/plugins/action-hooks.ts b/server/tests/plugins/action-hooks.ts
index ac9f2cea5..0f57ef7fe 100644
--- a/server/tests/plugins/action-hooks.ts
+++ b/server/tests/plugins/action-hooks.ts
@@ -1,13 +1,15 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 import 'mocha'
-import { ServerHookName, VideoPrivacy } from '@shared/models'
+import { ServerHookName, VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models'
 import {
  addVideoCommentReply,
  addVideoCommentThread,
+  addVideoInPlaylist,
  blockUser,
  createLive,
  createUser,
+  createVideoPlaylist,
  deleteVideoComment,
  getPluginTestPath,
  installPlugin,
@@ -69,6 +71,7 @@ describe('Test plugin action hooks', function () {
  })
  describe('Videos hooks', function () {
    it('Should run action:api.video.uploaded', async function () {
      const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video' })
      videoUUID = res.body.video.uuid
@@ -177,6 +180,41 @@ describe('Test plugin action hooks', function () {
    })
  })
+  describe('Playlist hooks', function () {
+    let playlistId: number
+    let videoId: number
+    before(async function () {
+      {
+        const res = await createVideoPlaylist({
+          url: servers[0].url,
+          token: servers[0].accessToken,
+          playlistAttrs: {
+            displayName: 'My playlist',
+            privacy: VideoPlaylistPrivacy.PRIVATE
+          }
+        })
+        playlistId = res.body.videoPlaylist.id
+      }
+      {
+        const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'my super name' })
+        videoId = res.body.video.id
+      }
+    })
+    it('Should run action:api.video-playlist-element.created', async function () {
+      await addVideoInPlaylist({
+        url: servers[0].url,
+        token: servers[0].accessToken,
+        playlistId,
+        elementAttrs: { videoId }
+      })
+      await checkHook('action:api.video-playlist-element.created')
+    })
+  })
  after(async function () {
    await cleanupTests(servers)
  })
diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts
index 7d4f7abb4..644b41dea 100644
--- a/server/tests/plugins/filter-hooks.ts
+++ b/server/tests/plugins/filter-hooks.ts
@@ -8,6 +8,7 @@ import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-code
 import {
  addVideoCommentReply,
  addVideoCommentThread,
+  advancedVideoPlaylistSearch,
  advancedVideosSearch,
  createLive,
  createVideoPlaylist,
@@ -38,6 +39,7 @@ import {
 import { cleanupTests, flushAndRunMultipleServers, ServerInfo, waitUntilLog } from '../../../shared/extra-utils/server/servers'
 import { getGoodVideoUrl, getMyVideoImports, importVideo } from '../../../shared/extra-utils/videos/video-imports'
 import {
+  VideoCommentThreadTree,
  VideoDetails,
  VideoImport,
  VideoImportState,
@@ -45,7 +47,6 @@ import {
  VideoPlaylistPrivacy,
  VideoPrivacy
 } from '../../../shared/models/videos'
-import { VideoCommentThreadTree } from '../../../shared/models/videos/video-comment.model'
 const expect = chai.expect
@@ -71,7 +72,7 @@ describe('Test plugin filter hooks', function () {
    await installPlugin({
      url: servers[0].url,
      accessToken: servers[0].accessToken,
-      path: getPluginTestPath('-two')
+      path: getPluginTestPath('-filter-translations')
    })
    for (let i = 0; i < 10; i++) {
@@ -326,7 +327,7 @@ describe('Test plugin filter hooks', function () {
    })
    it('Should blacklist on remote upload', async function () {
-      this.timeout(60000)
+      this.timeout(120000)
      const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'remote please blacklist me' })
      await waitJobs(servers)
@@ -335,7 +336,7 @@ describe('Test plugin filter hooks', function () {
    })
    it('Should blacklist on remote update', async function () {
-      this.timeout(60000)
+      this.timeout(120000)
      const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video' })
      await waitJobs(servers)
@@ -372,7 +373,7 @@ describe('Test plugin filter hooks', function () {
    const downloadVideos: VideoDetails[] = []
    before(async function () {
-      this.timeout(60000)
+      this.timeout(120000)
      await updateCustomSubConfig(servers[0].url, servers[0].accessToken, {
        transcoding: {
@@ -525,6 +526,27 @@ describe('Test plugin filter hooks', function () {
      await waitUntilLog(servers[0], 'Run hook filter:api.search.video-channels.index.list.params', 1)
      await waitUntilLog(servers[0], 'Run hook filter:api.search.video-channels.index.list.result', 1)
    })
+    it('Should run filter:api.search.video-playlists.local.list.{params,result}', async function () {
+      await advancedVideoPlaylistSearch(servers[0].url, {
+        search: 'Sun Jian'
+      })
+      await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.local.list.params', 1)
+      await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.local.list.result', 1)
+    })
+    it('Should run filter:api.search.video-playlists.index.list.{params,result}', async function () {
+      await advancedVideoPlaylistSearch(servers[0].url, {
+        search: 'Sun Jian',
+        searchTarget: 'search-index'
+      })
+      await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.local.list.params', 1)
+      await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.local.list.result', 1)
+      await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.index.list.params', 1)
+      await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.index.list.result', 1)
+    })
  })
  after(async function () {
diff --git a/server/tests/plugins/html-injection.ts b/server/tests/plugins/html-injection.ts
index 293c1df21..4fa8caa3a 100644
--- a/server/tests/plugins/html-injection.ts
+++ b/server/tests/plugins/html-injection.ts
@@ -15,7 +15,7 @@ import {
 const expect = chai.expect
-describe('Test plugins HTML inection', function () {
+describe('Test plugins HTML injection', function () {
  let server: ServerInfo = null
  before(async function () {
diff --git a/server/tests/plugins/plugin-helpers.ts b/server/tests/plugins/plugin-helpers.ts
index f72de8229..0296d6eb7 100644
--- a/server/tests/plugins/plugin-helpers.ts
+++ b/server/tests/plugins/plugin-helpers.ts
@@ -144,7 +144,7 @@ describe('Test plugin helpers', function () {
    let videoUUIDServer1: string
    before(async function () {
-      this.timeout(30000)
+      this.timeout(60000)
      {
        const res = await uploadVideoAndGetId({ server: servers[0], videoName: 'video server 1' })
diff --git a/server/tests/plugins/translations.ts b/server/tests/plugins/translations.ts
index 8dc2043b8..9fd2ba1c5 100644
--- a/server/tests/plugins/translations.ts
+++ b/server/tests/plugins/translations.ts
@@ -31,7 +31,7 @@ describe('Test plugin translations', function () {
    await installPlugin({
      url: server.url,
      accessToken: server.accessToken,
-      path: getPluginTestPath('-two')
+      path: getPluginTestPath('-filter-translations')
    })
  })
@@ -48,7 +48,7 @@ describe('Test plugin translations', function () {
      'peertube-plugin-test': {
        Hi: 'Coucou'
      },
-      'peertube-plugin-test-two': {
+      'peertube-plugin-test-filter-translations': {
        'Hello world': 'Bonjour le monde'
      }
    })
@@ -58,14 +58,14 @@ describe('Test plugin translations', function () {
    const res = await getPluginTranslations({ url: server.url, locale: 'it-IT' })
    expect(res.body).to.deep.equal({
-      'peertube-plugin-test-two': {
+      'peertube-plugin-test-filter-translations': {
        'Hello world': 'Ciao, mondo!'
      }
    })
  })
  it('Should remove the plugin and remove the locales', async function () {
-    await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-two' })
+    await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-filter-translations' })
    {
      const res = await getPluginTranslations({ url: server.url, locale: 'fr-FR' })
diff --git a/server/tests/plugins/video-constants.ts b/server/tests/plugins/video-constants.ts
index 5ee41fee1..eb014c596 100644
--- a/server/tests/plugins/video-constants.ts
+++ b/server/tests/plugins/video-constants.ts
@@ -32,7 +32,7 @@ describe('Test plugin altering video constants', function () {
    await installPlugin({
      url: server.url,
      accessToken: server.accessToken,
-      path: getPluginTestPath('-three')
+      path: getPluginTestPath('-video-constants')
    })
  })
@@ -45,6 +45,7 @@ describe('Test plugin altering video constants', function () {
    expect(languages['al_bhed']).to.equal('Al Bhed')
    expect(languages['al_bhed2']).to.equal('Al Bhed 2')
+    expect(languages['al_bhed3']).to.not.exist
  })
  it('Should have updated categories', async function () {
@@ -116,7 +117,7 @@ describe('Test plugin altering video constants', function () {
  })
  it('Should uninstall the plugin and reset languages, categories, licences and privacies', async function () {
-    await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-three' })
+    await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-video-constants' })
    {
      const res = await getVideoLanguages(server.url)
@@ -127,6 +128,7 @@ describe('Test plugin altering video constants', function () {
      expect(languages['al_bhed']).to.not.exist
      expect(languages['al_bhed2']).to.not.exist
+      expect(languages['al_bhed3']).to.not.exist
    }
    {
diff --git a/server/tests/register.ts b/server/tests/register.ts
new file mode 100644
index 000000000..af6c8c644
--- /dev/null
+++ b/server/tests/register.ts
@@ -0,0 +1,3 @@
+import { registerTSPaths } from '../helpers/register-ts-paths'
+registerTSPaths()