Updated unit test bootstrap.