diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java
index a394f181..d11ad1c9 100644
--- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java
+++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java
@@ -36,38 +36,28 @@ public class KubernetesServiceInstance implements ServiceInstance {
 
 	private static final String COLON = ":";
 
-	private String instanceId;
+	private final String instanceId;
 
-	private String serviceId;
+	private final String serviceId;
 
-	private String host;
+	private final String host;
 
-	private int port;
+	private final int port;
 
-	private URI uri;
+	private final URI uri;
 
-	private Boolean secure;
+	private final Boolean secure;
 
-	private Map<String, String> metadata;
+	private final Map<String, String> metadata;
 
 	/**
+	 * @param instanceId the id of the instance.
 	 * @param serviceId the id of the service.
 	 * @param host the address where the service instance can be found.
 	 * @param port the port on which the service is running.
 	 * @param metadata a map containing metadata.
 	 * @param secure indicates whether or not the connection needs to be secure.
-	 * @deprecated - use other constructor
 	 */
-	@Deprecated
-	public KubernetesServiceInstance(String serviceId, String host, int port,
-			Map<String, String> metadata, Boolean secure) {
-		this(null, serviceId, host, port, metadata, secure);
-	}
-
-	public KubernetesServiceInstance() {
-
-	}
-
 	public KubernetesServiceInstance(String instanceId, String serviceId, String host,
 			int port, Map<String, String> metadata, Boolean secure) {
 		this.instanceId = instanceId;
diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTest.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTests.java
similarity index 98%
rename from spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTest.java
rename to spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTests.java
index e4f69bd7..804c91a2 100644
--- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTest.java
+++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTests.java
@@ -36,7 +36,7 @@ import org.springframework.web.client.RestTemplate;
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = { "spring.cloud.kubernetes.discovery.all-namespaces=true" })
 @RunWith(SpringRunner.class)
-public class LoadBalancerAllNamespacesTest {
+public class LoadBalancerAllNamespacesTests {
 
 	@Autowired
 	RestTemplate restTemplate;
diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTest.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTests.java
similarity index 99%
rename from spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTest.java
rename to spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTests.java
index 1d34c2f3..bc757212 100644
--- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTest.java
+++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTests.java
@@ -35,7 +35,7 @@ import org.springframework.web.client.RestTemplate;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @RunWith(SpringRunner.class)
-public class LoadBalancerTest {
+public class LoadBalancerTests {
 
 	@Autowired
 	RestTemplate restTemplate;
diff --git a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerProperties.java b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerProperties.java
index 88e27152..f2d44086 100644
--- a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerProperties.java
+++ b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerProperties.java
@@ -25,13 +25,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class KubernetesLoadBalancerProperties {
 
 	/**
-	 * Ribbon enabled,default true.
+	 * Load balancer enabled,default true.
 	 */
 	private Boolean enabled = true;
 
 	/**
-	 * {@link KubernetesLoadBalancerMode} setting ribbon server list with ip of pod or
-	 * service name. default value is POD.
+	 * {@link KubernetesLoadBalancerMode} setting load balancer server list with ip of pod
+	 * or service name. default value is POD.
 	 */
 	private KubernetesLoadBalancerMode mode = KubernetesLoadBalancerMode.POD;
 
diff --git a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapper.java b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapper.java
index cff0b9bc..2ad20252 100644
--- a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapper.java
+++ b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapper.java
@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.kubernetes.loadbalancer;
 
-import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -129,11 +128,4 @@ public class KubernetesServiceInstanceMapper {
 				properties.getClusterDomain());
 	}
 
-	private URI createUri(String scheme, String host, int port) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(scheme).append(COLON).append(DSL).append(host).append(COLON)
-				.append(port);
-		return URI.create(sb.toString());
-	}
-
 }
diff --git a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServicesListSupplier.java b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServicesListSupplier.java
index 29d61bfa..bf807394 100644
--- a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServicesListSupplier.java
+++ b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServicesListSupplier.java
@@ -35,13 +35,13 @@ import org.springframework.core.env.Environment;
  */
 public class KubernetesServicesListSupplier implements ServiceInstanceListSupplier {
 
-	private Environment environment;
+	private final Environment environment;
 
-	private KubernetesClient kubernetesClient;
+	private final KubernetesClient kubernetesClient;
 
-	private KubernetesDiscoveryProperties discoveryProperties;
+	private final KubernetesDiscoveryProperties discoveryProperties;
 
-	private KubernetesServiceInstanceMapper mapper;
+	private final KubernetesServiceInstanceMapper mapper;
 
 	KubernetesServicesListSupplier(Environment environment,
 			KubernetesClient kubernetesClient, KubernetesServiceInstanceMapper mapper,
diff --git a/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTest.java b/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTests.java
similarity index 98%
rename from spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTest.java
rename to spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTests.java
index 098a2a9f..fe5de07a 100644
--- a/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTest.java
+++ b/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTests.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.discovery.KubernetesServiceInstance;
 
-public class KubernetesServiceInstanceMapperTest {
+public class KubernetesServiceInstanceMapperTests {
 
 	@Test
 	public void testMapperSimple() {
diff --git a/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTest.java b/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTests.java
similarity index 94%
rename from spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTest.java
rename to spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTests.java
index c0447026..a7059876 100644
--- a/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTest.java
+++ b/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTests.java
@@ -44,7 +44,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-public class KubernetesServiceListSupplierTest {
+public class KubernetesServiceListSupplierTests {
 
 	@Mock
 	Environment environment;
@@ -71,7 +71,8 @@ public class KubernetesServiceListSupplierTest {
 	void testPositiveMatch() {
 		when(environment.getProperty("loadbalancer.client.name"))
 				.thenReturn("test-service");
-		when(mapper.map(any(Service.class))).thenReturn(new KubernetesServiceInstance());
+		when(mapper.map(any(Service.class)))
+				.thenReturn(new KubernetesServiceInstance("", "", "", 0, null, false));
 		when(this.client.getNamespace()).thenReturn("test");
 		when(this.client.services()).thenReturn(this.serviceOperation);
 		when(this.serviceOperation.inNamespace("test")).thenReturn(namespaceOperation);
@@ -89,7 +90,8 @@ public class KubernetesServiceListSupplierTest {
 	void testPositiveMatchAllNamespaces() {
 		when(environment.getProperty("loadbalancer.client.name"))
 				.thenReturn("test-service");
-		when(mapper.map(any(Service.class))).thenReturn(new KubernetesServiceInstance());
+		when(mapper.map(any(Service.class)))
+				.thenReturn(new KubernetesServiceInstance("", "", "", 0, null, false));
 		when(this.client.services()).thenReturn(this.serviceOperation);
 		when(this.serviceOperation.inAnyNamespace()).thenReturn(this.multiDeletable);
 		when(this.multiDeletable.withField("metadata.name", "test-service"))