Fixed bootstrap for tests