Cleaned up bootstrap process
Refactoring applied to all tests