Rework application and test bootstraps.