Fixed bootstraping.
Fixed last tests.