More flexible name based resolving and switched to tap as test FW