Improve test bootstrap