Improved bootstrap.
Fixed test case.