Added router tests
Fix conflicts
Update resource name for network resource