diff --git a/.circleci/config.yml b/.circleci/config.yml
index 60cc48fe..b37b6814 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,6 @@ setup: true
 orbs:
     gravitee: gravitee-io/gravitee@4.1.1
 
-
 # our single workflow, that triggers the setup job defined above, filters on tag and branches are needed otherwise
 # some workflow and job will not be triggered for tags (default CircleCI behavior)
 workflows:
@@ -33,4 +32,4 @@ workflows:
                               - /.*/
                       tags:
                           only:
-                              - /^[0-9]+\.[0-9]+\.[0-9]+(-(alpha|beta|rc)\.[0-9]+)?$/
\ No newline at end of file
+                              - /^[0-9]+\.[0-9]+\.[0-9]+(-(alpha|beta|rc)\.[0-9]+)?$/
diff --git a/.github/renovate.json b/.github/renovate.json
index d50abf2d..2c1bf12b 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,22 +1,20 @@
 {
-  "extends": [
-    "config:base"
-  ],
-  "rebaseWhen": "conflicted",
-  "packageRules": [
-    {
-      "matchDatasources": ["orb"],
-      "matchUpdateTypes": ["patch", "minor"],
-      "automerge": true,
-      "automergeType": "branch",
-      "semanticCommitType": "ci"
-    },
-    {
-      "matchDepTypes": ["provided", "test", "build", "import", "parent"],
-      "matchUpdateTypes": ["patch", "minor"],
-      "automerge": true,
-      "automergeType": "branch",
-      "semanticCommitType": "chore"
-    }
-  ]
-}
\ No newline at end of file
+    "extends": ["config:base"],
+    "rebaseWhen": "conflicted",
+    "packageRules": [
+        {
+            "matchDatasources": ["orb"],
+            "matchUpdateTypes": ["patch", "minor"],
+            "automerge": true,
+            "automergeType": "branch",
+            "semanticCommitType": "ci"
+        },
+        {
+            "matchDepTypes": ["provided", "test", "build", "import", "parent"],
+            "matchUpdateTypes": ["patch", "minor"],
+            "automerge": true,
+            "automergeType": "branch",
+            "semanticCommitType": "chore"
+        }
+    ]
+}
diff --git a/pom.xml b/pom.xml
index 27df4cb2..e456c82f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+    Copyright © 2015 The Gravitee team (http://gravitee.io)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-            http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,6 +19,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.gravitee</groupId>
+        <artifactId>gravitee-parent</artifactId>
+        <version>22.1.13</version>
+    </parent>
 
     <groupId>io.gravitee.policy</groupId>
     <artifactId>gravitee-policy-ipfiltering</artifactId>
@@ -30,26 +35,27 @@
         You can use IPv4 and CIDR notation.
     </description>
 
-    <parent>
-        <groupId>io.gravitee</groupId>
-        <artifactId>gravitee-parent</artifactId>
-        <version>21.0.1</version>
-    </parent>
 
     <properties>
-        <gravitee-bom.version>5.0.0</gravitee-bom.version>
-        <gravitee-gateway-api.version>1.47.1</gravitee-gateway-api.version>
-        <gravitee-node-api.version>1.27.9</gravitee-node-api.version>
+        <gravitee-bom.version>6.0.60</gravitee-bom.version>
+        <gravitee-gateway-api.version>3.0.0</gravitee-gateway-api.version>
+        <gravitee-node-api.version>4.8.7</gravitee-node-api.version>
 
-        <gravitee-policy-api.version>1.4.0</gravitee-policy-api.version>
-        <gravitee-common.version>1.28.0</gravitee-common.version>
+        <gravitee-policy-api.version>1.11.0</gravitee-policy-api.version>
+        <gravitee-common.version>2.1.1</gravitee-common.version>
 
         <json-schema-generator-maven-plugin.version>1.3.0</json-schema-generator-maven-plugin.version>
-        <json-schema-generator-maven-plugin.outputDirectory>${project.build.directory}/schemas</json-schema-generator-maven-plugin.outputDirectory>
+        <json-schema-generator-maven-plugin.outputDirectory>${project.build.directory}/schemas
+        </json-schema-generator-maven-plugin.outputDirectory>
+
+        <commons-net.version>3.11.1</commons-net.version>
+        <commons-validator.version>1.9.0</commons-validator.version>
+
+        <!-- Maven plugins -->
+        <maven-plugin-assembly.version>3.7.1</maven-plugin-assembly.version>
+        <maven-plugin-properties.version>1.2.1</maven-plugin-properties.version>
 
-        <maven-assembly-plugin.version>2.5.5</maven-assembly-plugin.version>
-        <commons-net.version>3.6</commons-net.version>
-        <commons-validator.version>1.7</commons-validator.version>
+        <!-- Property used by the publication job in CI-->
         <publish-folder-path>graviteeio-apim/plugins/policies</publish-folder-path>
     </properties>
 
@@ -119,11 +125,26 @@
             <artifactId>commons-net</artifactId>
             <version>${commons-net.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -175,7 +196,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
+                <version>${maven-plugin-assembly.version}</version>
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
diff --git a/src/assembly/policy-assembly.xml b/src/assembly/policy-assembly.xml
index 24372e90..32e3abb6 100644
--- a/src/assembly/policy-assembly.xml
+++ b/src/assembly/policy-assembly.xml
@@ -1,12 +1,12 @@
 <!--
 
-    Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+    Copyright © 2015 The Gravitee team (http://gravitee.io)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-            http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/gravitee/policy/ipfiltering/DnsConfiguration.java b/src/main/java/io/gravitee/policy/ipfiltering/DnsConfiguration.java
index ca8e406f..7f46a621 100644
--- a/src/main/java/io/gravitee/policy/ipfiltering/DnsConfiguration.java
+++ b/src/main/java/io/gravitee/policy/ipfiltering/DnsConfiguration.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/gravitee/policy/ipfiltering/IPFilteringPolicy.java b/src/main/java/io/gravitee/policy/ipfiltering/IPFilteringPolicy.java
index fda8620d..c5ffb153 100644
--- a/src/main/java/io/gravitee/policy/ipfiltering/IPFilteringPolicy.java
+++ b/src/main/java/io/gravitee/policy/ipfiltering/IPFilteringPolicy.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,6 +32,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.validator.routines.InetAddressValidator;
 import org.slf4j.Logger;
@@ -42,10 +43,9 @@
  * @author Azize ELAMRANI (azize.elamrani at graviteesource.com)
  * @author GraviteeSource Team
  */
+@Slf4j
 public class IPFilteringPolicy {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(IPFilteringPolicy.class);
-
     private final IPFilteringPolicyConfiguration configuration;
 
     /**
@@ -87,7 +87,7 @@ public void onRequest(ExecutionContext executionContext, PolicyChain policyChain
                                     promise.complete();
                                 }
                             } else {
-                                LOGGER.error("Cannot resolve host: '" + host + "'", event.cause());
+                                log.error("Cannot resolve host: '" + host + "'", event.cause());
                                 promise.complete();
                             }
                         }
@@ -121,7 +121,7 @@ public void onRequest(ExecutionContext executionContext, PolicyChain policyChain
                                     promise.complete();
                                 }
                             } else {
-                                LOGGER.error("Cannot resolve host: '" + host + "'", event.cause());
+                                log.error("Cannot resolve host: '" + host + "'", event.cause());
                                 promise.complete();
                             }
                         }
diff --git a/src/main/java/io/gravitee/policy/ipfiltering/IPFilteringPolicyConfiguration.java b/src/main/java/io/gravitee/policy/ipfiltering/IPFilteringPolicyConfiguration.java
index bfc8207e..bd2b01d9 100644
--- a/src/main/java/io/gravitee/policy/ipfiltering/IPFilteringPolicyConfiguration.java
+++ b/src/main/java/io/gravitee/policy/ipfiltering/IPFilteringPolicyConfiguration.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,8 +18,11 @@
 import io.gravitee.policy.api.PolicyConfiguration;
 import java.util.List;
 import java.util.stream.Collectors;
+import lombok.Getter;
+import lombok.Setter;
 
-@SuppressWarnings("unused")
+@Getter
+@Setter
 public class IPFilteringPolicyConfiguration implements PolicyConfiguration {
 
     /**
@@ -43,44 +46,4 @@ public class IPFilteringPolicyConfiguration implements PolicyConfiguration {
     private LookupIpVersion lookupIpVersion;
 
     private boolean isInclusiveHostCount = false;
-
-    public boolean isMatchAllFromXForwardedFor() {
-        return matchAllFromXForwardedFor;
-    }
-
-    public void setMatchAllFromXForwardedFor(boolean matchAllFromXForwardedFor) {
-        this.matchAllFromXForwardedFor = matchAllFromXForwardedFor;
-    }
-
-    public List<String> getWhitelistIps() {
-        return whitelistIps;
-    }
-
-    public void setWhitelistIps(List<String> whitelistIps) {
-        this.whitelistIps = whitelistIps == null ? List.of() : whitelistIps.stream().map(String::trim).collect(Collectors.toList());
-    }
-
-    public List<String> getBlacklistIps() {
-        return blacklistIps;
-    }
-
-    public void setBlacklistIps(List<String> blacklistIps) {
-        this.blacklistIps = blacklistIps == null ? List.of() : blacklistIps.stream().map(String::trim).collect(Collectors.toList());
-    }
-
-    public LookupIpVersion getLookupIpVersion() {
-        return lookupIpVersion == null ? LookupIpVersion.ALL : lookupIpVersion;
-    }
-
-    public void setLookupIpVersion(LookupIpVersion lookupIpVersion) {
-        this.lookupIpVersion = lookupIpVersion;
-    }
-
-    public void setInclusiveHostCount(boolean inclusiveHostCount) {
-        isInclusiveHostCount = inclusiveHostCount;
-    }
-
-    public boolean isInclusiveHostCount() {
-        return isInclusiveHostCount;
-    }
 }
diff --git a/src/main/java/io/gravitee/policy/ipfiltering/LazyDnsClient.java b/src/main/java/io/gravitee/policy/ipfiltering/LazyDnsClient.java
index 59786c38..3203a75d 100644
--- a/src/main/java/io/gravitee/policy/ipfiltering/LazyDnsClient.java
+++ b/src/main/java/io/gravitee/policy/ipfiltering/LazyDnsClient.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,6 +22,8 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.dns.DnsClient;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 
 /**
  * LazyDnsClient is an abstract class that provides a lazy initialization of a DNS client. The DNS client is only created when required.
@@ -31,13 +33,12 @@
  * @see DnsClient
  * @see ExecutionContext
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class LazyDnsClient {
 
-    private LazyDnsClient() {}
-
     private static DnsClient dnsClient;
 
-    public static DnsClient get(ExecutionContext context) {
+    public static DnsClient get(final ExecutionContext context) {
         if (dnsClient == null) {
             DnsConfiguration dnsConfiguration = new DnsConfiguration(context.getComponent(Configuration.class));
             dnsConfiguration.getDnsClientOptions().setRecursionDesired(true);
@@ -55,16 +56,9 @@ public static void lookup(
     ) {
         DnsClient client = get(executionContext);
         switch (lookupIpVersion) {
-            case IPV6:
-                client.lookup6(host, handler);
-                break;
-            case IPV4:
-                client.lookup4(host, handler);
-                break;
-            case ALL:
-            default:
-                client.lookup(host, handler);
-                break;
+            case IPV6 -> client.lookup6(host, handler);
+            case IPV4 -> client.lookup4(host, handler);
+            default -> client.lookup(host, handler);
         }
     }
 }
diff --git a/src/main/java/io/gravitee/policy/ipfiltering/LookupIpVersion.java b/src/main/java/io/gravitee/policy/ipfiltering/LookupIpVersion.java
index ced78699..0de20224 100644
--- a/src/main/java/io/gravitee/policy/ipfiltering/LookupIpVersion.java
+++ b/src/main/java/io/gravitee/policy/ipfiltering/LookupIpVersion.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/resources/schemas/schema-form.json b/src/main/resources/schemas/schema-form.json
index 7562dc45..74d1bfeb 100644
--- a/src/main/resources/schemas/schema-form.json
+++ b/src/main/resources/schemas/schema-form.json
@@ -1,45 +1,41 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "additionalProperties": false,
-  "properties" : {
-    "matchAllFromXForwardedFor" : {
-      "title" : "Use X-Forwarded-For header",
-      "type" : "boolean"
-    },
-    "whitelistIps" : {
-      "title" : "IPs Whitelist (CIDR and hosts allowed)",
-      "type" : "array",
-      "items" : {
-        "title" : "IP / CIDR / Host",
-        "type" : "string",
-        "minLength": 1
-      }
-    },
-    "blacklistIps" : {
-      "title" : "IPs Blacklist (CIDR and hosts allowed)",
-      "type" : "array",
-      "items" : {
-        "title" : "IP / CIDR / Host",
-        "type" : "string",
-        "minLength": 1
-      }
-    },
-    "lookupIpVersion" : {
-      "title" : "Lookup IP version to use (default is ALL)",
-      "description": "If you're not sure your DNS server can handle multi-question requests (both V4 and V6) specify a version",
-      "type" : "string",
-      "enum": [
-        "IPV4",
-        "IPV6",
-        "ALL"
-      ],
-      "default": "ALL"
-    },
-    "isInclusiveHostCount": {
-        "title": "Inclusive Host Count",
-        "description": "If true, include the network and broadcast addresses (useful for CIDR/31 and CIDR/32).",
-        "type": "boolean"
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "additionalProperties": false,
+    "properties": {
+        "matchAllFromXForwardedFor": {
+            "title": "Use X-Forwarded-For header",
+            "type": "boolean"
+        },
+        "whitelistIps": {
+            "title": "IPs Whitelist (CIDR and hosts allowed)",
+            "type": "array",
+            "items": {
+                "title": "IP / CIDR / Host",
+                "type": "string",
+                "minLength": 1
+            }
+        },
+        "blacklistIps": {
+            "title": "IPs Blacklist (CIDR and hosts allowed)",
+            "type": "array",
+            "items": {
+                "title": "IP / CIDR / Host",
+                "type": "string",
+                "minLength": 1
+            }
+        },
+        "lookupIpVersion": {
+            "title": "Lookup IP version to use (default is ALL)",
+            "description": "If you're not sure your DNS server can handle multi-question requests (both V4 and V6) specify a version",
+            "type": "string",
+            "enum": ["IPV4", "IPV6", "ALL"],
+            "default": "ALL"
+        },
+        "isInclusiveHostCount": {
+            "title": "Inclusive Host Count",
+            "description": "If true, include the network and broadcast addresses (useful for CIDR/31 and CIDR/32).",
+            "type": "boolean"
+        }
     }
-  }
 }
diff --git a/src/test/java/io/gravitee/policy/ExtractIpsTest.java b/src/test/java/io/gravitee/policy/ExtractIpsTest.java
index 15cbce9b..c34f9fae 100644
--- a/src/test/java/io/gravitee/policy/ExtractIpsTest.java
+++ b/src/test/java/io/gravitee/policy/ExtractIpsTest.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +15,11 @@
  */
 package io.gravitee.policy;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import io.gravitee.gateway.api.Request;
 import io.gravitee.gateway.api.http.HttpHeaderNames;
@@ -25,57 +27,49 @@
 import io.gravitee.policy.ipfiltering.IPFilteringPolicy;
 import io.gravitee.policy.ipfiltering.IPFilteringPolicyConfiguration;
 import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 public class ExtractIpsTest {
 
     @Mock
     Request mockRequest;
 
-    @Mock
-    IPFilteringPolicyConfiguration mockConfiguration;
+    IPFilteringPolicyConfiguration filteringPolicyConfiguration;
 
-    @Before
-    public void init() {
-        initMocks(this);
+    @BeforeEach
+    public void beforeEach() {
+        filteringPolicyConfiguration = new IPFilteringPolicyConfiguration();
     }
 
     @Test
-    public void shouldReturnRemoteAddress() {
-        when(mockConfiguration.isMatchAllFromXForwardedFor()).thenReturn(false);
+    public void should_return_remote_address() {
+        filteringPolicyConfiguration.setMatchAllFromXForwardedFor(false);
         when(mockRequest.remoteAddress()).thenReturn("127.0.0.1");
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
-
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
         List<String> ips = policy.extractIps(mockRequest);
 
-        assertNotNull(ips);
-        assertFalse(ips.isEmpty());
-        assertEquals(1, ips.size());
-        assertEquals("127.0.0.1", ips.get(0));
-        verify(mockConfiguration, times(1)).isMatchAllFromXForwardedFor();
+        assertThat(ips).hasSize(1).containsOnly("127.0.0.1");
         verify(mockRequest, never()).headers();
     }
 
     @Test
-    public void shouldReturnXFF() {
-        when(mockConfiguration.isMatchAllFromXForwardedFor()).thenReturn(true);
+    public void should_return_XForwardFor() {
+        filteringPolicyConfiguration.setMatchAllFromXForwardedFor(true);
         HttpHeaders httpHeaders = HttpHeaders.create().set(HttpHeaderNames.X_FORWARDED_FOR, "localhost, 10.0.0.1, 192.168.0.5, unknown");
         when(mockRequest.headers()).thenReturn(httpHeaders);
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         List<String> ips = policy.extractIps(mockRequest);
 
-        assertNotNull(ips);
-        assertFalse(ips.isEmpty());
-        assertEquals(4, ips.size());
-        assertEquals("localhost", ips.get(0));
-        assertFalse(ips.contains("127.0.0.1"));
-        verify(mockConfiguration, times(1)).isMatchAllFromXForwardedFor();
+        assertThat(ips).hasSize(4).containsOnly("localhost", "10.0.0.1", "192.168.0.5", "unknown");
         verify(mockRequest, atLeastOnce()).headers();
         verify(mockRequest, never()).remoteAddress();
     }
diff --git a/src/test/java/io/gravitee/policy/IPFilteringPolicyTest.java b/src/test/java/io/gravitee/policy/IPFilteringPolicyTest.java
index 0353eef7..11d70613 100644
--- a/src/test/java/io/gravitee/policy/IPFilteringPolicyTest.java
+++ b/src/test/java/io/gravitee/policy/IPFilteringPolicyTest.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,13 +29,20 @@
 import io.gravitee.policy.ipfiltering.IPFilteringPolicyConfiguration;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 public class IPFilteringPolicyTest {
 
     @Mock
@@ -50,44 +57,49 @@ public class IPFilteringPolicyTest {
     @Mock
     PolicyChain mockPolicychain;
 
-    @Mock
-    IPFilteringPolicyConfiguration mockConfiguration;
+    IPFilteringPolicyConfiguration filteringPolicyConfiguration;
 
-    @Before
-    public void init() {
-        initMocks(this);
-        when(executionContext.request()).thenReturn(mockRequest);
-        when(executionContext.response()).thenReturn(mockResponse);
+    @BeforeEach
+    public void beforeEach() {
+        filteringPolicyConfiguration = new IPFilteringPolicyConfiguration();
+        lenient().when(executionContext.request()).thenReturn(mockRequest);
+        lenient().when(executionContext.response()).thenReturn(mockResponse);
     }
 
     @Test
-    public void shouldNotTestXFF() throws Exception {
-        when(mockConfiguration.isMatchAllFromXForwardedFor()).thenReturn(false);
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+    public void should_not_test_XFF_header() {
+        filteringPolicyConfiguration.setMatchAllFromXForwardedFor(false);
+        filteringPolicyConfiguration.setWhitelistIps(List.of("127.0.0.1"));
+        when(mockRequest.remoteAddress()).thenReturn("127.0.0.1");
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
-        verify(mockConfiguration, times(1)).isMatchAllFromXForwardedFor();
         verify(mockRequest, never()).headers();
+        verify(mockPolicychain, never()).failWith(any(PolicyResult.class));
+        verify(mockPolicychain).doNext(any(), any());
     }
 
     @Test
-    public void shouldTestXFF() throws Exception {
-        when(mockConfiguration.isMatchAllFromXForwardedFor()).thenReturn(true);
-        when(mockRequest.headers()).thenReturn(HttpHeaders.create());
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+    public void should_test_XFF() {
+        filteringPolicyConfiguration.setMatchAllFromXForwardedFor(true);
+        filteringPolicyConfiguration.setWhitelistIps(List.of("10.0.0.1"));
+        HttpHeaders httpHeaders = HttpHeaders.create().set(HttpHeaderNames.X_FORWARDED_FOR, "localhost, 10.0.0.1, 192.168.0.5, unknown");
+        when(mockRequest.headers()).thenReturn(httpHeaders);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
-        verify(mockConfiguration, times(1)).isMatchAllFromXForwardedFor();
         verify(mockRequest, atLeastOnce()).headers();
+        verify(mockPolicychain, never()).failWith(any(PolicyResult.class));
+        verify(mockPolicychain).doNext(any(), any());
     }
 
     @Test
-    public void shouldFailCausedIpInBlacklist() {
-        when(mockConfiguration.getBlacklistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+    public void should_fail_caused_ip_in_blacklist() {
+        filteringPolicyConfiguration.setBlacklistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
         when(mockRequest.remoteAddress()).thenReturn("192.168.0.1");
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -96,10 +108,10 @@ public void shouldFailCausedIpInBlacklist() {
     }
 
     @Test
-    public void shouldFailCausedIpNotInWhitelist() {
-        when(mockConfiguration.getWhitelistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+    public void should_fail_caused_ip_not_in_whitelist() {
+        filteringPolicyConfiguration.setWhitelistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
         when(mockRequest.remoteAddress()).thenReturn("192.168.0.4");
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -108,10 +120,11 @@ public void shouldFailCausedIpNotInWhitelist() {
     }
 
     @Test
-    public void shouldFailCausedIpInBlacklistAndWhitelist() {
-        when(mockConfiguration.getBlacklistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+    public void should_fail_caused_ip_in_blacklist_and_whitelist() {
+        filteringPolicyConfiguration.setBlacklistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+        filteringPolicyConfiguration.setWhitelistIps(List.of("192.168.0.1"));
         when(mockRequest.remoteAddress()).thenReturn("192.168.0.1");
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -120,11 +133,12 @@ public void shouldFailCausedIpInBlacklistAndWhitelist() {
     }
 
     @Test
-    public void shouldFailCausedIpInBlacklistAndNotInWhitelist() {
-        when(mockConfiguration.getBlacklistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
-        when(mockConfiguration.getWhitelistIps()).thenReturn(Arrays.asList("192.168.0.4", "192.168.0.5", "192.168.0.6"));
+    public void should_fail_caused_ip_in_blacklist_and_not_in_whitelist() {
+        filteringPolicyConfiguration.setBlacklistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+        filteringPolicyConfiguration.setWhitelistIps(List.of("192.168.0.4", "192.168.0.5", "192.168.0.6"));
 
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        when(mockRequest.remoteAddress()).thenReturn("192.168.0.1");
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -133,11 +147,11 @@ public void shouldFailCausedIpInBlacklistAndNotInWhitelist() {
     }
 
     @Test
-    public void shouldFailCausedIpNotInBlacklistAndNotInWhitelist() {
-        when(mockConfiguration.getBlacklistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
-        when(mockConfiguration.getWhitelistIps()).thenReturn(Arrays.asList("192.168.0.4", "192.168.0.5", "192.168.0.6"));
+    public void should_Fail_Caused_Ip_Not_In_Blacklist_And_Not_In_Whitelist() {
+        filteringPolicyConfiguration.setBlacklistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+        filteringPolicyConfiguration.setWhitelistIps(List.of("192.168.0.4", "192.168.0.5", "192.168.0.6"));
         when(mockRequest.remoteAddress()).thenReturn("192.168.0.7");
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -146,10 +160,10 @@ public void shouldFailCausedIpNotInBlacklistAndNotInWhitelist() {
     }
 
     @Test
-    public void shouldSucceedCausedIpNotInBlacklistAndNothingInWhitelist() {
-        when(mockConfiguration.getBlacklistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+    public void should_succeed_caused_ip_not_in_blacklist_and_nothing_in_whitelist() {
+        filteringPolicyConfiguration.setBlacklistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
         when(mockRequest.remoteAddress()).thenReturn("192.168.0.4");
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -158,11 +172,11 @@ public void shouldSucceedCausedIpNotInBlacklistAndNothingInWhitelist() {
     }
 
     @Test
-    public void shouldSucceedCausedIpNotInBlacklistAndInWhitelist() {
-        when(mockConfiguration.getBlacklistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
-        when(mockConfiguration.getWhitelistIps()).thenReturn(Arrays.asList("192.168.0.4", "192.168.0.5", "192.168.0.6"));
+    public void should_succeed_caused_ip_not_in_blacklist_and_in_whitelist() {
+        filteringPolicyConfiguration.setBlacklistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+        filteringPolicyConfiguration.setWhitelistIps(List.of("192.168.0.4", "192.168.0.5", "192.168.0.6"));
         when(mockRequest.remoteAddress()).thenReturn("192.168.0.4");
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -171,13 +185,13 @@ public void shouldSucceedCausedIpNotInBlacklistAndInWhitelist() {
     }
 
     @Test
-    public void shouldSucceedCausedIpsNotInBlacklistAndInWhitelist() {
-        when(mockConfiguration.getBlacklistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
-        when(mockConfiguration.getWhitelistIps()).thenReturn(Arrays.asList("192.168.0.4", "192.168.0.5", "192.168.0.6"));
-        when(mockConfiguration.isMatchAllFromXForwardedFor()).thenReturn(true);
+    public void should_succeed_caused_ips_not_in_blacklist_and_in_whitelist() {
+        filteringPolicyConfiguration.setBlacklistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+        filteringPolicyConfiguration.setWhitelistIps(List.of("192.168.0.4", "192.168.0.5", "192.168.0.6"));
+        filteringPolicyConfiguration.setMatchAllFromXForwardedFor(true);
         HttpHeaders httpHeaders = HttpHeaders.create().set(HttpHeaderNames.X_FORWARDED_FOR, "localhost, 10.0.0.1, 192.168.0.5, unknown");
         when(mockRequest.headers()).thenReturn(httpHeaders);
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -186,12 +200,12 @@ public void shouldSucceedCausedIpsNotInBlacklistAndInWhitelist() {
     }
 
     @Test
-    public void shouldFailedCausedIpsInBlacklist() {
-        when(mockConfiguration.getBlacklistIps()).thenReturn(Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
-        when(mockConfiguration.isMatchAllFromXForwardedFor()).thenReturn(true);
+    public void should_failed_caused_ips_i_nblacklist() {
+        filteringPolicyConfiguration.setBlacklistIps(List.of("192.168.0.1", "192.168.0.2", "192.168.0.3"));
+        filteringPolicyConfiguration.setMatchAllFromXForwardedFor(true);
         HttpHeaders httpHeaders = HttpHeaders.create().set(HttpHeaderNames.X_FORWARDED_FOR, "localhost, 10.0.0.1, 192.168.0.2, unknown");
         when(mockRequest.headers()).thenReturn(httpHeaders);
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
@@ -200,15 +214,14 @@ public void shouldFailedCausedIpsInBlacklist() {
     }
 
     @Test
-    public void shouldSucceedWithNullValue() {
-        ArrayList<String> ips = new ArrayList<>();
+    public void should_succeed_with_null_value() {
+        List<String> ips = new ArrayList<>();
         ips.add(null);
-
-        when(mockConfiguration.getBlacklistIps()).thenReturn(ips);
-        when(mockConfiguration.isMatchAllFromXForwardedFor()).thenReturn(true);
+        filteringPolicyConfiguration.setBlacklistIps(ips);
+        filteringPolicyConfiguration.setMatchAllFromXForwardedFor(true);
         HttpHeaders httpHeaders = HttpHeaders.create().set(HttpHeaderNames.X_FORWARDED_FOR, "localhost, 10.0.0.1, 192.168.0.2, unknown");
         when(mockRequest.headers()).thenReturn(httpHeaders);
-        IPFilteringPolicy policy = new IPFilteringPolicy(mockConfiguration);
+        IPFilteringPolicy policy = new IPFilteringPolicy(filteringPolicyConfiguration);
 
         policy.onRequest(executionContext, mockPolicychain);
 
diff --git a/src/test/java/io/gravitee/policy/IsFilteredTest.java b/src/test/java/io/gravitee/policy/IsFilteredTest.java
index 70f3a9ce..90310126 100644
--- a/src/test/java/io/gravitee/policy/IsFilteredTest.java
+++ b/src/test/java/io/gravitee/policy/IsFilteredTest.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,100 +15,110 @@
  */
 package io.gravitee.policy;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.gravitee.policy.ipfiltering.IPFilteringPolicy;
 import io.gravitee.policy.ipfiltering.IPFilteringPolicyConfiguration;
 import java.util.Arrays;
 import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IsFilteredTest {
 
     @Test
-    public void shouldNotFilteredIfEmptyList() {
+    public void should_not_filtered_if_empty_list() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("1.1.1.1", Collections.emptyList());
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     @Test
-    public void shouldNotFilteredIfEmptyIp() {
+    public void should_not_filtered_if_empty_ip() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("", Collections.singletonList("1.1.1.1"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     @Test
-    public void shouldNotFilteredIfNullIp() {
+    public void should_not_filtered_if_null_ip() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered(null, Collections.singletonList("1.1.1.1"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     @Test
-    public void shouldFilteredIfIpsAreEqualsWithOneElementInList() {
+    public void should_filtered_if_ips_are_equals_with_one_element_in_list() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("1.1.1.1", Collections.singletonList("1.1.1.1"));
 
-        assertTrue(filtered);
+        assertThat(filtered).isTrue();
     }
 
     @Test
-    public void shouldFilteredIfIpsAreEqualsWithMultipleElementInList() {
+    public void should_filtered_if_ips_are_equals_with_multiple_element_in_list() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("1.1.1.1", Arrays.asList("1.1.0.1", "1.1.1.1", "1.1.2.1"));
 
-        assertTrue(filtered);
+        assertThat(filtered).isTrue();
     }
 
     @Test
-    public void shouldFilteredIfIpIsNotAnIP() {
+    public void should_filtered_if_ip_is_not_an_ip() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("Gravitee.IO", Arrays.asList("1.1.0.1", "1.1.1.1", "1.1.2.1"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     @Test
-    public void shouldNotFilteredIfIpsAreNotIps() {
+    public void should_not_filtered_if_ips_are_not_ips() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("1.1.1.1", Arrays.asList("Gravitee.IO", "is", "awesome"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     // from 192.168.0.0 to 192.168.0.255 => 192.168.0.0/24
     @Test
-    public void shouldFilteredCIDR_ForMask_24() {
+    public void should_filtered_cidr_for_mask_24() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         for (int i = 1; i < 255; i++) {
             boolean filtered = policy.isFiltered("192.168.0." + i, Collections.singletonList("192.168.0.0/24"));
 
-            assertTrue("should filter 192.168.0." + i, filtered);
+            assertThat(filtered).as("should filter 192.168.0.%s", i).isTrue();
         }
     }
 
     @Test
-    public void shouldFilteredCIDR_With_isInclusiveHostCount() {
+    public void should_filtered_single_cidr_for_mask_32() {
+        IPFilteringPolicyConfiguration configuration = new IPFilteringPolicyConfiguration();
+        configuration.setInclusiveHostCount(true);
+        IPFilteringPolicy policy = new IPFilteringPolicy(configuration);
+
+        boolean filtered = policy.isFiltered("20.126.185.99", Collections.singletonList("20.126.185.99/32"));
+        assertThat(filtered).isTrue();
+    }
+
+    @Test
+    public void should_filtered_cidr_with_is_inclusive_host_count() {
         IPFilteringPolicyConfiguration configuration = new IPFilteringPolicyConfiguration();
         configuration.setInclusiveHostCount(true);
         IPFilteringPolicy policy = new IPFilteringPolicy(configuration);
 
         boolean filtered = policy.isFiltered("192.168.1.0", Collections.singletonList("192.168.1.0/31"));
 
-        assertTrue("should filter ", filtered);
+        assertThat(filtered).isTrue();
     }
 
     /**
@@ -116,79 +126,79 @@ public void shouldFilteredCIDR_With_isInclusiveHostCount() {
      */
     // from 192.168.0.0 to 192.168.0.255 => 192.168.0.0/24
     @Test
-    public void shouldNotFilteredCIDR_192_168_0_0_ForMask_24() {
+    public void should_not_filtered_cidr_192_168_0_0_for_mask_24() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("192.168.0.0", Collections.singletonList("192.168.0.0/24"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     // from 192.168.0.0 to 192.168.0.255 => 192.168.0.0/24
     @Test
-    public void shouldNotFilteredCIDR_192_168_0_255_ForMask_24() {
+    public void should_not_filtered_cidr_192_168_0_255_for_mask_24() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("192.168.0.255", Collections.singletonList("192.168.0.0/24"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     // from 192.168.0.0 to 192.168.3.255 => 192.168.0.0/22
     @Test
-    public void shouldNotFilteredCIDR_192_168_0_0_ForMask_22() {
+    public void should_not_filtered_cidr_192_168_0_0_for_mask_22() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("192.168.0.0", Collections.singletonList("192.168.0.0/22"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     // from 192.168.0.0 to 192.168.3.255 => 192.168.0.0/22
     @Test
-    public void shouldFilteredCIDR_192_168_0_255_ForMask_22() {
+    public void should_filtered_cidr_192_168_0_255_for_mask_22() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("192.168.0.255", Collections.singletonList("192.168.0.0/22"));
 
-        assertTrue(filtered);
+        assertThat(filtered).isTrue();
     }
 
     // from 192.168.0.0 to 192.168.3.255 => 192.168.0.0/22
     @Test
-    public void shouldFilteredCIDR_192_168_3_254_ForMask_22() {
+    public void should_filtered_cidr_192_168_3_254_for_mask_22() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("192.168.3.254", Collections.singletonList("192.168.0.0/22"));
 
-        assertTrue(filtered);
+        assertThat(filtered).isTrue();
     }
 
     // from 192.168.0.0 to 192.168.3.255 => 192.168.0.0/22
     @Test
-    public void shouldNotFilteredCIDR_192_168_3_255_ForMask_22() {
+    public void should_not_filtered_cidr_192_168_3_255_for_mask_22() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("192.168.3.255", Collections.singletonList("192.168.0.0/22"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 
     @Test
-    public void shouldFilteredWhenIPIsInList() {
+    public void should_filtered_when_ip_is_in_list() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("192.168.0.2", Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
 
-        assertTrue(filtered);
+        assertThat(filtered).isTrue();
     }
 
     @Test
-    public void shouldNotFilteredWhenIPIsNotInList() {
+    public void should_not_filtered_when_ip_is_not_in_list() {
         IPFilteringPolicy policy = new IPFilteringPolicy(new IPFilteringPolicyConfiguration());
 
         boolean filtered = policy.isFiltered("192.168.0.4", Arrays.asList("192.168.0.1", "192.168.0.2", "192.168.0.3"));
 
-        assertFalse(filtered);
+        assertThat(filtered).isFalse();
     }
 }