Improved unit tests bootstrap