Fixes Bootstrapper tests.

Change-Id: Idf9a1993c9c6928362659edac67146d7d2f5b246