Now there are both bundle and tool versions
(cherry picked from commit 00c1ca31e7a0bf4eb0193b14858c2597e90f09d5)
Added testing script from g8testing branch