-import 'mocha'
-import * as chai from 'chai'
-import {
- cleanupTests,
- flushAndRunMultipleServers,
- MockInstancesIndex,
- ServerInfo,
- setAccessTokensToServers,
- wait,
- waitJobs
-} from '@shared/extra-utils'
-
-const expect = chai.expect
-
-async function checkFollow (follower: ServerInfo, following: ServerInfo, exists: boolean) {
+import { expect } from 'chai'
+import { MockInstancesIndex } from '@server/tests/shared'
+import { wait } from '@shared/core-utils'
+import { cleanupTests, createMultipleServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
+
+async function checkFollow (follower: PeerTubeServer, following: PeerTubeServer, exists: boolean) {