Improved bootstrapping, services and test