ADEN-1199 Fix for HubsV2 and added test case for sub-hubs