Fix test bootstrap