ADEN-1027 Merge test to the existing corporate test