Fixed tests bootstrap code