Adds unit test for boostrapper
Renames unit test methods
Renames yet again the tests