Add updated bootstrap for tests