Fixed test and added a better bootstrap mechanism