-import { checkVideoFilesWereRemoved, createUser, doubleFollow, flushAndRunMultipleServers, removeUser, userLogin, wait } from '../../utils'
-import { flushTests, getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index'
-import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../utils/users/accounts'
-import { setAccessTokensToServers } from '../../utils/users/login'
+import {
+ checkTmpIsEmpty,
+ checkVideoFilesWereRemoved,
+ cleanupTests,
+ createUser,
+ doubleFollow,
+ flushAndRunMultipleServers,
+ getAccountVideos,
+ getVideoChannelsList,
+ removeUser,
+ updateMyUser,
+ userLogin
+} from '../../../../shared/extra-utils'
+import { getMyUserInformation, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../../../shared/extra-utils/index'
+import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/extra-utils/users/accounts'
+import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
+import { User } from '../../../../shared/models/users'
+import { VideoChannel } from '../../../../shared/models/videos'
+import { waitJobs } from '../../../../shared/extra-utils/server/jobs'