[Tests] Update for v4
[Tests] Update for v4

GawainLynch/bolt,lenvanessen/bolt,GawainLynch/bolt,lenvanessen/bolt,nikgo/bolt,nikgo/bolt,GawainLynch/bolt,GawainLynch/bolt,lenvanessen/bolt,lenvanessen/bolt,nikgo/bolt,nikgo/bolt