Updated BootstrapHandler and test utils.