Merge "Fix bootstrap in unit tests"