Fixing bootstrap, introduction test-box testing at bootstrap time.

Change-Id: If8a44d83f6739c71ac13d6accc2a9ac21ee94837