Merge "Add a test for filtering list servers for a specific tenant"