Update AbstractBootstrap for tests