Updated tests bootstrap