Modified the new class to find the bridge topology and tests