Updating menus to match with HEAD of Salesforce module
Code sniffer adhearance
Updating tests with HEAD of Salesforce module