Fixing tests bootstrap;