Updated test bootstrap