-import { HttpStatusCode } from '@shared/core-utils'
-import {
- cleanupTests,
- flushAndRunServer,
- MockSmtpServer,
- ServerInfo,
- setAccessTokensToServers,
- uploadVideo,
- waitJobs
-} from '@shared/extra-utils'
+import { MockSmtpServer } from '@server/tests/shared'
+import { HttpStatusCode } from '@shared/models'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'