Merge "Revert test changes for post startup methods change"