diff --git a/src/main/java/org/elasticsearch/shield/authc/support/UsernamePasswordToken.java b/src/main/java/org/elasticsearch/shield/authc/support/UsernamePasswordToken.java
index 6624b6f0e7b..8b9c40ff0dd 100644
--- a/src/main/java/org/elasticsearch/shield/authc/support/UsernamePasswordToken.java
+++ b/src/main/java/org/elasticsearch/shield/authc/support/UsernamePasswordToken.java
@@ -71,10 +71,10 @@ public class UsernamePasswordToken implements AuthenticationToken {
     }
 
     public static void putTokenHeader(TransportRequest request, UsernamePasswordToken token) {
-        request.putHeader("Authorization", headerValue(token.username, token.password));
+        request.putHeader("Authorization", basicAuthHeaderValue(token.username, token.password));
     }
 
-    public static String headerValue(String username, char[] passwd) {
+    public static String basicAuthHeaderValue(String username, char[] passwd) {
         String basicToken = username + ":" + new String(passwd);
         basicToken = new String(Base64.encodeBase64(basicToken.getBytes(Charsets.UTF_8)), Charsets.UTF_8);
         return "Basic " + basicToken;
diff --git a/src/main/java/org/elasticsearch/shield/authz/Permission.java b/src/main/java/org/elasticsearch/shield/authz/Permission.java
index b1286c88f36..4bb540e27a2 100644
--- a/src/main/java/org/elasticsearch/shield/authz/Permission.java
+++ b/src/main/java/org/elasticsearch/shield/authz/Permission.java
@@ -234,11 +234,11 @@ public interface Permission {
                             }
                         }
                     }
-                }
-
-                for (String index : explodeWildcards((IndicesRequest) request, metaData)) {
-                    if (!indexNameMatcher.apply(index)) {
-                        return false;
+                } else {
+                    for (String index : explodeWildcards((IndicesRequest) request, metaData)) {
+                        if (!indexNameMatcher.apply(index)) {
+                            return false;
+                        }
                     }
                 }
 
diff --git a/src/main/java/org/elasticsearch/shield/transport/SecuredTransportService.java b/src/main/java/org/elasticsearch/shield/transport/SecuredTransportService.java
index 1d40197fe6d..9b2c2c228eb 100644
--- a/src/main/java/org/elasticsearch/shield/transport/SecuredTransportService.java
+++ b/src/main/java/org/elasticsearch/shield/transport/SecuredTransportService.java
@@ -135,19 +135,19 @@ public class SecuredTransportService extends TransportService {
 
         @Override
         public void sendResponse(TransportResponse response) throws IOException {
-            if (proceed(response)) {
+            if (filter(response)) {
                 channel.sendResponse(response);
             }
         }
 
         @Override
         public void sendResponse(TransportResponse response, TransportResponseOptions options) throws IOException {
-            if (proceed(response)) {
+            if (filter(response)) {
                 channel.sendResponse(response, options);
             }
         }
 
-        private boolean proceed(TransportResponse response) throws IOException {
+        private boolean filter(TransportResponse response) throws IOException {
             try {
                 filter.outboundResponse(channel.action(), response);
             } catch (Throwable t) {
diff --git a/src/test/java/org/elasticsearch/shield/plugin/ShieldPluginTests.java b/src/test/java/org/elasticsearch/shield/plugin/ShieldPluginTests.java
index d67faa58c91..85fc22ff902 100644
--- a/src/test/java/org/elasticsearch/shield/plugin/ShieldPluginTests.java
+++ b/src/test/java/org/elasticsearch/shield/plugin/ShieldPluginTests.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.headerValue;
+import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
 import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
 import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import static org.hamcrest.Matchers.hasSize;
@@ -44,6 +44,7 @@ public class ShieldPluginTests extends ElasticsearchIntegrationTest {
         File folder = newFolder();
         ImmutableSettings.Builder builder = ImmutableSettings.builder()
                 .put("plugin.types", SecurityPlugin.class.getName())
+                .put(super.nodeSettings(nodeOrdinal))
                 .put("shield.audit.enabled", true)
                 .put("shield.authc.esusers.files.users", copyFile(folder, "users"))
                 .put("shield.authc.esusers.files.users_roles", copyFile(folder, "users_roles"))
@@ -51,7 +52,7 @@ public class ShieldPluginTests extends ElasticsearchIntegrationTest {
                 .put("shield.n2n.file", copyFile(folder, "ip_filter.yml"))
                 .put(TransportModule.TRANSPORT_SERVICE_TYPE_KEY, SecuredTransportService.class.getName())
                         // for the test internal node clients
-                .put("request.headers.Authorization", headerValue("test_user", "changeme".toCharArray()));
+                .put("request.headers.Authorization", basicAuthHeaderValue("test_user", "changeme".toCharArray()));
 
         if (OsUtils.MAC) {
             builder.put("network.host", randomBoolean() ? "127.0.0.1" : "::1");
@@ -64,7 +65,7 @@ public class ShieldPluginTests extends ElasticsearchIntegrationTest {
     @Override
     protected Settings transportClientSettings() {
         return ImmutableSettings.builder()
-                .put("request.headers.Authorization", headerValue("test_user", "changeme".toCharArray()))
+                .put("request.headers.Authorization", basicAuthHeaderValue("test_user", "changeme".toCharArray()))
                 .build();
     }
 
diff --git a/src/test/java/org/elasticsearch/shield/transport/ssl/SSLConfigTests.java b/src/test/java/org/elasticsearch/shield/transport/ssl/SSLConfigTests.java
index 3991fe1d54b..235150a2b5e 100644
--- a/src/test/java/org/elasticsearch/shield/transport/ssl/SSLConfigTests.java
+++ b/src/test/java/org/elasticsearch/shield/transport/ssl/SSLConfigTests.java
@@ -25,7 +25,7 @@ public class SSLConfigTests extends ElasticsearchTestCase {
 
     @Before
     public void setup() throws Exception {
-        testnodeStore = new File(getClass().getResource("/org/elasticsearch/shield/transport/ssl/certs/simple/testnode.jks").toURI());
+        testnodeStore = new File(getClass().getResource("certs/simple/testnode.jks").toURI());
     }
 
     @Test
diff --git a/src/test/java/org/elasticsearch/shield/transport/ssl/SslIntegrationTests.java b/src/test/java/org/elasticsearch/shield/transport/ssl/SslIntegrationTests.java
index 944ad21d7ba..c161f778b6a 100644
--- a/src/test/java/org/elasticsearch/shield/transport/ssl/SslIntegrationTests.java
+++ b/src/test/java/org/elasticsearch/shield/transport/ssl/SslIntegrationTests.java
@@ -89,7 +89,6 @@ public class SslIntegrationTests extends ElasticsearchIntegrationTest {
                 .put("shield.http.ssl.truststore_password", "testnode")
                 // SSL SETUP
                 .put("http.type", NettySecuredHttpServerTransportModule.class.getName())
-                .put("plugins.load_classpath_plugins", false)
                 .put("plugin.types", N2NPlugin.class.getName())
                 .put(TransportModule.TRANSPORT_TYPE_KEY, NettySecuredTransportModule.class.getName())
                 .put("shield.n2n.file", ipFilterFile.getPath());