Added more testable bootstrapping code.