[FIX] Pass Jenkins tests