Fixed bootstrap test cases after refactor