diff --git a/.travis.yml b/.travis.yml
index 50b89972..9c6aefed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ android:
     - tools # to get the new `repository-11.xml`
     - platform-tools
     - tools # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943)
-    - build-tools-25.0.1
+    - build-tools-25.0.3
     - android-22
     - android-25
 # Without these the build fails
diff --git a/Examples/restcomm-olympus/app/app.iml b/Examples/restcomm-olympus/app/app.iml
index 0fa3cd23..e647eba4 100644
--- a/Examples/restcomm-olympus/app/app.iml
+++ b/Examples/restcomm-olympus/app/app.iml
@@ -62,13 +62,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -76,6 +69,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -121,7 +121,6 @@
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-25.4.0" level="project" />
-    <orderEntry type="library" exported="" name="testfairy-android-sdk-1.5.4" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-25.4.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-25.4.0" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-25.4.0" level="project" />
@@ -129,6 +128,22 @@
     <orderEntry type="library" exported="" name="support-compat-25.4.0" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-25.4.0" level="project" />
     <orderEntry type="library" exported="" name="libwebrtc-1.0.0-beta5-16765" level="project" />
+    <orderEntry type="library" exported="" name="testfairy-android-sdk-1.5.5" level="project" />
     <orderEntry type="module" module-name="restcomm.android.sdk" exported="" />
+    <orderEntry type="library" exported="" name="android-jain-sip-ri-1.2.293" level="project" />
+    <orderEntry type="library" exported="" name="core-1.54.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="prov-1.54.0.0" level="project" />
+    <orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
+    <orderEntry type="library" exported="" name="pkix-1.54.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Examples/restcomm-olympus/app/build.gradle b/Examples/restcomm-olympus/app/build.gradle
index 52150ad5..2bd12e50 100644
--- a/Examples/restcomm-olympus/app/build.gradle
+++ b/Examples/restcomm-olympus/app/build.gradle
@@ -23,7 +23,7 @@ buildscript {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.1'
+    buildToolsVersion '25.0.3'
 
     dexOptions {
         jumboMode = true