Fix up test bootstrap