Address all CR feedback except updating all AzureTool derived classes