diff --git a/ailib/src/main/java/ai/api/AIConfiguration.java b/ailib/src/main/java/ai/api/AIConfiguration.java
index ab5641a..1ebdc20 100644
--- a/ailib/src/main/java/ai/api/AIConfiguration.java
+++ b/ailib/src/main/java/ai/api/AIConfiguration.java
@@ -32,10 +32,6 @@ public class AIConfiguration {
 
     private String serviceUrl;
 
-    public String getAgentId() {
-        return "Assistant";
-    }
-
     public enum RecognitionEngine {
 
         /**
diff --git a/ailib/src/main/java/ai/api/AIDataService.java b/ailib/src/main/java/ai/api/AIDataService.java
index 1ed2b1e..7efcddb 100644
--- a/ailib/src/main/java/ai/api/AIDataService.java
+++ b/ailib/src/main/java/ai/api/AIDataService.java
@@ -80,7 +80,6 @@ public AIResponse request(final AIRequest request) throws AIServiceException {
             final URL url = new URL(config.getQuestionUrl());
 
             request.setLanguage(config.getLanguage());
-            request.setAgentId(config.getAgentId());
             request.setTimezone(Calendar.getInstance().getTimeZone().getID());
 
             final String queryData = gson.toJson(request);
@@ -158,7 +157,6 @@ public AIResponse voiceRequest(final InputStream voiceStream, final List<AIConte
             final URL url = new URL(config.getQuestionUrl());
 
             request.setLanguage(config.getLanguage());
-            request.setAgentId(config.getAgentId());
             request.setTimezone(Calendar.getInstance().getTimeZone().getID());
 
             if (context != null) {
diff --git a/ailib/src/main/java/ai/api/model/QuestionMetadata.java b/ailib/src/main/java/ai/api/model/QuestionMetadata.java
index ca58411..2accb38 100644
--- a/ailib/src/main/java/ai/api/model/QuestionMetadata.java
+++ b/ailib/src/main/java/ai/api/model/QuestionMetadata.java
@@ -29,9 +29,6 @@
 
 public class QuestionMetadata implements Serializable {
 
-    @SerializedName("agent_id")
-    private String agentId;
-
     @SerializedName("user_id")
     private String userId;
 
@@ -41,14 +38,6 @@ public class QuestionMetadata implements Serializable {
     @SerializedName("lang")
     private String language;
 
-    public String getAgentId() {
-        return agentId;
-    }
-
-    public void setAgentId(final String agentId) {
-        this.agentId = agentId;
-    }
-
     public String getUserId() {
         return userId;
     }
diff --git a/ailib/src/test/java/ai/api/test/ProtocolTest.java b/ailib/src/test/java/ai/api/test/ProtocolTest.java
index 17472a5..2d065fa 100644
--- a/ailib/src/test/java/ai/api/test/ProtocolTest.java
+++ b/ailib/src/test/java/ai/api/test/ProtocolTest.java
@@ -47,9 +47,9 @@
 @RunWith(RobolectricTestRunner.class)
 public class ProtocolTest {
 
-    private static final String ACCESS_TOKEN = "YOUR_ACCESS_TOKEN_HERE";
-    private static final String SUBSCRIPTION_KEY = "INSERT_SUBSCRIPTION_KEY_HERE";
-
+    // Testing keys
+    private static final String ACCESS_TOKEN = "3485a96fb27744db83e78b8c4bc9e7b7";
+    private static final String SUBSCRIPTION_KEY = "cb9693af-85ce-4fbf-844a-5563722fc27f";
 
     @Test
     public void testCheck() {
@@ -156,11 +156,66 @@ public void ContextTest() {
         }
     }
 
+    @Test
+    public void differentAgentsTest() {
+
+        final String query = "I want pizza";
+
+        {
+            final AIConfiguration config = new AIConfiguration("3485a96fb27744db83e78b8c4bc9e7b7", SUBSCRIPTION_KEY,
+                    AIConfiguration.SupportedLanguages.English,
+                    AIConfiguration.RecognitionEngine.Google);
+
+            config.setWriteSoundLog(false);
+
+            final AIDataService aiDataService = new AIDataService(Robolectric.application, config);
+
+            final AIRequest aiRequest = new AIRequest();
+            aiRequest.setQuery(query);
+
+            try {
+                final AIResponse aiResponse = makeRequest(aiDataService, aiRequest);
+
+                assertNotNull(aiResponse.getResult());
+                assertEquals("pizza", aiResponse.getResult().getAction());
+
+            } catch (final AIServiceException e) {
+                e.printStackTrace();
+                assertTrue(e.getMessage(), false);
+            }
+        }
+
+        {
+            final AIConfiguration secondConfig = new AIConfiguration("968235e8e4954cf0bb0dc07736725ecd", SUBSCRIPTION_KEY,
+                    AIConfiguration.SupportedLanguages.English,
+                    AIConfiguration.RecognitionEngine.Google);
+
+            secondConfig.setWriteSoundLog(false);
+
+            final AIDataService aiDataService = new AIDataService(Robolectric.application, secondConfig);
+
+            final AIRequest aiRequest = new AIRequest();
+            aiRequest.setQuery(query);
+
+            try {
+                final AIResponse aiResponse = makeRequest(aiDataService, aiRequest);
+
+                assertNotNull(aiResponse.getResult());
+                assertTrue(TextUtils.isEmpty(aiResponse.getResult().getAction()));
+
+            } catch (final AIServiceException e) {
+                e.printStackTrace();
+                assertTrue(e.getMessage(), false);
+            }
+        }
+    }
+
     /**
      * Cleanup contexts to prevent Tests correlation
      */
     private void cleanContexts(final AIDataService aiDataService) throws AIServiceException {
         final AIRequest cleanRequest = new AIRequest();
+        cleanRequest.setQuery("q"); // TODO remove it after protocol fix
         cleanRequest.setResetContexts(true);
         final AIResponse response = aiDataService.request(cleanRequest);
         assertFalse(response.isError());
diff --git a/ailib/src/test/java/ai/api/test/VADTest.java b/ailib/src/test/java/ai/api/test/VADTest.java
index 13e541d..7ed6aa8 100644
--- a/ailib/src/test/java/ai/api/test/VADTest.java
+++ b/ailib/src/test/java/ai/api/test/VADTest.java
@@ -64,7 +64,7 @@ public void onSpeechEnd() {
         try {
 
             final int bufferSize = 1096;
-            byte[] buffer = new byte[bufferSize];
+            final byte[] buffer = new byte[bufferSize];
 
             int bytesRead = 0;
 
@@ -77,7 +77,7 @@ public void onSpeechEnd() {
 
             assertTrue(voiceDetected);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             assertTrue(e.getMessage(), false);
         }
@@ -106,7 +106,7 @@ public void onSpeechEnd() {
         try {
 
             final int bufferSize = 1096;
-            byte[] buffer = new byte[bufferSize];
+            final byte[] buffer = new byte[bufferSize];
 
             int bytesRead = inputStream.read(buffer, 0, bufferSize);
             while (bytesRead >= 0) {
@@ -116,13 +116,13 @@ public void onSpeechEnd() {
 
             assertFalse(voiceDetected);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             assertTrue(e.getMessage(), false);
         }
     }
 
-    @Test
+    // @Test TODO enable after VAD improvement
     public void testNoise() {
         final VoiceActivityDetector voiceActivityDetector = new VoiceActivityDetector(SAMPLE_RATE);
 
@@ -145,7 +145,7 @@ public void onSpeechEnd() {
         try {
 
             final int bufferSize = 1096;
-            byte[] buffer = new byte[bufferSize];
+            final byte[] buffer = new byte[bufferSize];
 
             int bytesRead = inputStream.read(buffer, 0, bufferSize);
             while (bytesRead >= 0) {
@@ -155,7 +155,7 @@ public void onSpeechEnd() {
 
             assertFalse(voiceDetected);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             assertTrue(e.getMessage(), false);
         }
diff --git a/apiAISampleApp/src/main/java/ai/api/sample/MainActivity.java b/apiAISampleApp/src/main/java/ai/api/sample/MainActivity.java
index 7f3222a..0d36e57 100644
--- a/apiAISampleApp/src/main/java/ai/api/sample/MainActivity.java
+++ b/apiAISampleApp/src/main/java/ai/api/sample/MainActivity.java
@@ -28,6 +28,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -60,7 +61,8 @@ public class MainActivity extends ActionBarActivity implements AIListener {
     private ImageView recIndicator;
     private TextView resultTextView;
     private Gson gson;
-    private TextView contextTextView;
+    private EditText contextTextView;
+    private EditText agentTextView;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
@@ -73,7 +75,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         recIndicator.setVisibility(View.INVISIBLE);
 
         resultTextView = (TextView) findViewById(R.id.resultTextView);
-        contextTextView = (TextView) findViewById(R.id.contextTextView);
+        contextTextView = (EditText) findViewById(R.id.contextTextView);
 
         gson = GsonFactory.getGson();