HubsTests performance refactoring