Main/Bootstrap test cases
More refactoring