Updated test
refactored to use switch->id instead of switch->ip