diff --git a/README.md b/README.md
index a8a428d..421c8bd 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
-# Bluemix App ID
-Android SDK for the Bluemix App ID service
+# IBM Cloud App ID Android SDK
 
 [![Bluemix powered][img-bluemix-powered]][url-bluemix]
 [![Travis][img-travis-master]][url-travis-master]
-[![Coveralls][img-coveralls-master]][url-coveralls-master]
-[![Codacy][img-codacy]][url-codacy]
+[![Coverage Status][img-coveralls-master]][url-coveralls-master]
+[![Codacy Badge][img-codacy]][url-codacy]
 [![Release](https://jitpack.io/v/ibm-cloud-security/appid-clientsdk-android.svg)](https://jitpack.io/#ibm-cloud-security/appid-clientsdk-android)
 [![License][img-license]][url-bintray]
 
@@ -13,11 +12,14 @@ Android SDK for the Bluemix App ID service
 [![GithubForks][img-github-forks]][url-github-forks]
 
 ## Requirements
-API 25 or above, Java 8.x, Android SDK tools 25.2.5 or above, Android SDK Platform Tools 25.0.3 or above, Android Build Tools version 25.0.2
+* API 25 or above
+* Java 8.x
+* Android SDK tools 25.2.5 or above
+* Android SDK Platform Tools 25.0.3 or above
+* Android Build Tools version 25.0.2
 
 ## Installing the SDK:
-1.  Add the JitPack repository to your build file, 
-     Add it in your root build.gradle at the end of repositories:
+1.  Add the JitPack repository to the your root `build.gradle` file at the end of the repository.
 
     ```gradle
 	    allprojects {
@@ -31,7 +33,7 @@ API 25 or above, Java 8.x, Android SDK tools 25.2.5 or above, Android SDK Platfo
 2. Add the dependency for the App ID client SDK:
     ```gradle
     dependencies {
-		    compile 'com.github.ibm-cloud-security:appid-clientsdk-android:1.+'
+		    compile 'com.github.ibm-cloud-security:appid-clientsdk-android:2.+'
 	    }
     ```
     
@@ -43,9 +45,7 @@ API 25 or above, Java 8.x, Android SDK tools 25.2.5 or above, Android SDK Platfo
     }
     ```
 
-## Using the SDK:
-
-### Initializing the App ID client SDK
+## Initializing the App ID client SDK
 
 Initialize the client SDK by passing the context, tenantId and region parameters to the initialize method. A common, though not mandatory, place to put the initialization code is in the onCreate method of the main activity in your Android application.
 ```java
@@ -54,8 +54,8 @@ AppID.getInstance().initialize(getApplicationContext(), <tenantId>, AppID.REGION
 * Replace "tenantId" with the App ID service tenantId.
 * Replace the AppID.REGION_UK with your App ID region (AppID.REGION_US_SOUTH, AppID.REGION_SYDNEY).
 
-### Using Login Widget
-Use LoginWidget class to start the authorization flow.   
+## Using the Login Widget
+Use the LoginWidget class to start the authorization flow.   
 
 ```java
 LoginWidget loginWidget = AppID.getInstance().getLoginWidget();
@@ -78,27 +78,130 @@ loginWidget.launch(this, new AuthorizationListener() {
 ```
 **Note**: 
 
-The Login widget default configuration use Facebook and Google as authentication options.
-If you configure only one of them the login widget will NOT launch and the user will be redirect to the configured idp authentication screen.
-<!--
-### Login using Resource Owner Password
-You can obtain access token and id token by supplying the end user's username and the end user's password.
-```java
-AppID.getInstance().obtainTokensWithROP(getApplicationContext(), username, password, 
-        new TokenResponseListener() {
-        @Override
-         public void onAuthorizationFailure (AuthorizationException exception) {
-            //Exception occurred
-         }
-                                                                                             
+* The default configuration use Facebook and Google as authentication options. If you configure only one of them the login widget will *not* launch and the user will be redirected to the configured identity provider authentication screen.
+* When using Cloud Directory, and "Email verification" is configured to *not* allow users to sign-in without email verification, then the "onAuthorizationSuccess" of the "AuthorizationListener" will be invoked without tokens.
+
+## Managing Cloud Directory with the Android SDK
+{: #managing-android} 
+
+ Make sure to set Cloud Directory identity provider to ON in AppID dashboard, when using the following APIs.
+
+ ### Login using Resource Owner Password
+ You can obtain access token and id token by supplying the end user's username and the end user's password.
+ ```java
+ AppID.getInstance().obtainTokensWithROP(getApplicationContext(), username, password, 
+         new TokenResponseListener() {
          @Override
-         public void onAuthorizationSuccess (AccessToken accessToken, IdentityToken identityToken) {
-           //User authenticated
-         }
-        });
-```
- -->
-### Anonymous Login
+          public void onAuthorizationFailure (AuthorizationException exception) {
+             //Exception occurred
+          }
+                                                                                              
+          @Override
+          public void onAuthorizationSuccess (AccessToken accessToken, IdentityToken identityToken) {
+            //User authenticated
+          }
+         });
+ ```
+ ### Sign Up
+Make sure to set **Allow users to sign up and reset their password** to **ON**, in the settings for Cloud Directory.
+Use the LoginWidget class to start the sign up flow.
+
+ ```java
+ LoginWidget loginWidget = AppID.getInstance().getLoginWidget();
+ loginWidget.launchSignUp(this, new AuthorizationListener() {
+			 @Override
+			 public void onAuthorizationFailure (AuthorizationException exception) {
+				 //Exception occurred
+			 }
+
+			 @Override
+			 public void onAuthorizationCanceled () {
+				 //Sign up canceled by the user
+			 }
+
+			 @Override
+			 public void onAuthorizationSuccess (AccessToken accessToken, IdentityToken identityToken) {
+				 if (accessToken != null && identityToken != null) {
+				     //User authenticated
+				 } else {
+				     //email verification is required
+				 }
+				 
+			 }
+		 });
+ ```
+  ### Forgot Password
+  Make sure to set **Allow users to sign up and reset their password** and **Forgot password email** to **ON**, in the settings for Cloud Directory
+  
+ Use LoginWidget class to start the forgot password flow. 
+  ```java
+  LoginWidget loginWidget = AppID.getInstance().getLoginWidget();
+  loginWidget.launchForgotPassword(this, new AuthorizationListener() {
+ 			 @Override
+ 			 public void onAuthorizationFailure (AuthorizationException exception) {
+ 				 //Exception occurred
+ 			 }
+  
+ 			 @Override
+ 			 public void onAuthorizationCanceled () {
+ 				 //forogt password canceled by the user
+ 			 }
+  
+ 			 @Override
+ 			 public void onAuthorizationSuccess (AccessToken accessToken, IdentityToken identityToken) {
+ 				 //forgot password finished, in this case accessToken and identityToken will be null.
+ 				 
+ 			 }
+ 		 });
+  ```
+  ### Change Details
+  Make sure to set **Allow users to sign up and reset their password** to **ON**, in Cloud Directory settings that are in AppID dashboard. Use LoginWidget class to start the change details flow. This API can be used only when the user is logged in using Cloud Directory identity provider.
+  
+   ```java
+   LoginWidget loginWidget = AppID.getInstance().getLoginWidget();
+   loginWidget.launchChangeDetails(this, new AuthorizationListener() {
+  			 @Override
+  			 public void onAuthorizationFailure (AuthorizationException exception) {
+  				 //Exception occurred
+  			 }
+   
+  			 @Override
+  			 public void onAuthorizationCanceled () {
+  				 //changed details canceled by the user
+  			 }
+   
+  			 @Override
+  			 public void onAuthorizationSuccess (AccessToken accessToken, IdentityToken identityToken) {
+  				 //User authenticated, and fresh tokens received 
+  			 }
+  		 });
+   ```
+   ### Change Password
+   Make sure to set **Allow users to sign up and reset their password** to **ON**, in the settings for Cloud Directory.
+   
+   Use LoginWidget class to start the change password flow. This API can be used only when the user logged in by using Cloud Directory as their identity provider.
+   
+   ```java
+    LoginWidget loginWidget = AppID.getInstance().getLoginWidget();
+    loginWidget.launchChangePassword(this, new AuthorizationListener() {
+   			 @Override
+   			 public void onAuthorizationFailure (AuthorizationException exception) {
+   				 //Exception occurred
+   			 }
+    
+   			 @Override
+   			 public void onAuthorizationCanceled () {
+   				 //change password canceled by the user
+   			 }
+    
+   			 @Override
+   			 public void onAuthorizationSuccess (AccessToken accessToken, IdentityToken identityToken) {
+   				   //User authenticated, and fresh tokens received 
+   			 }
+   		 });
+   ```
+ 
+## Anonymous Login
 ```java
 AppID.getInstance().loginAnonymously(getApplicationContext(), new AuthorizationListener() {
 			@Override
@@ -118,7 +221,7 @@ AppID.getInstance().loginAnonymously(getApplicationContext(), new AuthorizationL
 		});
 ```
 
-### User profile attributes
+## User profile attributes
 ```java
 AppID appId = AppID.getInstance();
 String name = "name";
@@ -172,7 +275,7 @@ appId.getUserAttributeManager().deleteAttribute(name, new UserAttributeResponseL
 		});
 ```
 
-### Invoking protected resources
+## Invoking protected resources
 ```java
 BMSClient bmsClient = BMSClient.getInstance();
 bmsClient.initialize(getApplicationContext(), AppID.REGION_UK);
@@ -199,7 +302,7 @@ public void onFailure (Response response, Throwable t, JSONObject extendedInfo)
 });
 ```
 
-### License
+## License
 This package contains code licensed under the Apache License, Version 2.0 (the "License"). You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 and may also view the License in the LICENSE file within this package.
 
 [img-bluemix-powered]: https://img.shields.io/badge/bluemix-powered-blue.svg
@@ -218,8 +321,8 @@ This package contains code licensed under the Apache License, Version 2.0 (the "
 [img-travis-master]: https://travis-ci.org/ibm-cloud-security/appid-clientsdk-android.svg
 [url-travis-master]: https://travis-ci.org/ibm-cloud-security/appid-clientsdk-android
 
-[img-coveralls-master]: https://coveralls.io/repos/github/ibm-cloud-security/appid-clientsdk-android/badge.svg
-[url-coveralls-master]: https://coveralls.io/github/ibm-cloud-security/appid-clientsdk-android
+[img-coveralls-master]: https://coveralls.io/repos/github/ibm-cloud-security/appid-clientsdk-android/badge.svg?branch=master
+[url-coveralls-master]: https://coveralls.io/github/ibm-cloud-security/appid-clientsdk-android?branch=master
 
-[img-codacy]: https://api.codacy.com/project/badge/Grade/d41f8f069dd343769fcbdb55089561fc?branch=master
-[url-codacy]: https://www.codacy.com/app/ibm-cloud-security/appid-clientsdk-android
+[img-codacy]: https://api.codacy.com/project/badge/Grade/be6f5f4cdae446909279d014bc650b1b
+[url-codacy]: https://www.codacy.com/app/rotembr/appid-clientsdk-android?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ibm-cloud-security/appid-clientsdk-android&amp;utm_campaign=Badge_Grad
diff --git a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
index 4b9fc94..cbca033 100644
--- a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
+++ b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
@@ -117,6 +117,108 @@ public void onAuthorizationCanceled() {
             @Override
             public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
                 logger.info("onAuthorizationSuccess");
+                if (accessToken != null && identityToken != null) {
+                    logger.info("access_token: " + accessToken.getRaw());
+                    logger.info("id_token: " + identityToken.getRaw());
+                    logger.info("access_token isExpired: " + accessToken.isExpired());
+                    logger.info("id_token isExpired: " + identityToken.isExpired());
+                    identifiedAccessToken = accessToken;
+                    extractAndDisplayDataFromIdentityToken(identityToken);
+                } else {
+                    //in case we are in strict mode
+                    hideProgress();
+                }
+
+            }
+        }, anonymousAccessToken != null ? anonymousAccessToken.getRaw() : null);
+    }
+
+    public void onSignUpClick(View v) {
+        logger.debug("onSignUpClick");
+        showProgress();
+        LoginWidget loginWidget = appId.getLoginWidget();
+        loginWidget.launchSignUp(this, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                logger.info("sign up: onAuthorizationFailure: " + exception.getMessage());
+                showResponse(exception.getMessage());
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                logger.info("sign up: onAuthorizationCanceled");
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                logger.info("sign up: onAuthorizationSuccess");
+                if (accessToken != null && identityToken != null) {
+                    logger.info("access_token: " + accessToken.getRaw());
+                    logger.info("id_token: " + identityToken.getRaw());
+                    logger.info("access_token isExpired: " + accessToken.isExpired());
+                    logger.info("id_token isExpired: " + identityToken.isExpired());
+                    identifiedAccessToken = accessToken;
+                    extractAndDisplayDataFromIdentityToken(identityToken);
+                } else {
+                    //in case we are in strict mode
+                    hideProgress();
+                }
+
+
+            }
+        });
+    }
+
+    public void onForgotPasswordClick(View v) {
+        logger.debug("onForgotPasswordClick");
+        showProgress();
+        LoginWidget loginWidget = appId.getLoginWidget();
+        loginWidget.launchForgotPassword(this, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                logger.info("Forgot Password: onAuthorizationFailure: " + exception.getMessage());
+                showResponse(exception.getMessage());
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                logger.info("Forgot Password: onAuthorizationCanceled");
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                logger.info("Forgot Password:  onAuthorizationSuccess");
+                hideProgress();
+            }
+        });
+    }
+
+    public void onChangePasswordClick(View v) {
+        logger.debug("onChangePasswordClick");
+        showResponse("");
+        showProgress();
+        LoginWidget loginWidget = appId.getLoginWidget();
+        loginWidget.launchChangePassword(this, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                logger.info("Change Password: onAuthorizationFailure: " + exception.getMessage());
+                showResponse(exception.getMessage());
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                logger.info("Change Password: onAuthorizationCanceled");
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                logger.info("Change Password: onAuthorizationSuccess");
                 logger.info("access_token: " + accessToken.getRaw());
                 logger.info("id_token: " + identityToken.getRaw());
                 logger.info("access_token isExpired: " + accessToken.isExpired());
@@ -124,7 +226,39 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
                 identifiedAccessToken = accessToken;
                 extractAndDisplayDataFromIdentityToken(identityToken);
             }
-        }, anonymousAccessToken != null ? anonymousAccessToken.getRaw() : null);
+        });
+    }
+
+    public void onChangeDetailsClick(View v) {
+        logger.debug("onChangeDetailsClick");
+        showResponse("");
+        showProgress();
+        LoginWidget loginWidget = appId.getLoginWidget();
+        loginWidget.launchChangeDetails(this, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                logger.info("Change Details: onAuthorizationFailure: " + exception.getMessage());
+                showResponse(exception.getMessage());
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                logger.info("Change Details: onAuthorizationCanceled");
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                logger.info("Change Details: onAuthorizationSuccess");
+                logger.info("access_token: " + accessToken.getRaw());
+                logger.info("id_token: " + identityToken.getRaw());
+                logger.info("access_token isExpired: " + accessToken.isExpired());
+                logger.info("id_token isExpired: " + identityToken.isExpired());
+                identifiedAccessToken = accessToken;
+                extractAndDisplayDataFromIdentityToken(identityToken);
+            }
+        });
     }
 
     public void onGetTokenUsingRoP(View v) {
@@ -164,7 +298,7 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
                     identifiedAccessToken = accessToken;
                     extractAndDisplayDataFromIdentityToken(identityToken);
                 }
-            });
+            }, anonymousAccessToken != null ? anonymousAccessToken.getRaw() : null);
         }
     }
 
@@ -349,6 +483,7 @@ public void run() {
                 findViewById(R.id.loginButton).setEnabled(false);
                 findViewById(R.id.ropButton).setEnabled(false);
                 findViewById(R.id.protectedRequestButton).setEnabled(false);
+                findViewById(R.id.signUpButton).setEnabled(false);
                 findViewById(R.id.deleteAttribute).setEnabled(false);
                 findViewById(R.id.anonloginButton).setEnabled(false);
                 findViewById(R.id.getAllAttributes).setEnabled(false);
@@ -357,6 +492,9 @@ public void run() {
                 findViewById(R.id.putAttribute).setEnabled(false);
                 findViewById(R.id.editAttrName).setEnabled(false);
                 findViewById(R.id.editAttrValue).setEnabled(false);
+                findViewById(R.id.changePasswordButton).setEnabled(false);
+                findViewById(R.id.changeDetailsButton).setEnabled(false);
+                findViewById(R.id.forgotPassword).setEnabled(false);
             }
         });
     }
@@ -369,6 +507,7 @@ public void run() {
                 findViewById(R.id.loginButton).setEnabled(true);
                 findViewById(R.id.ropButton).setEnabled(true);
                 findViewById(R.id.protectedRequestButton).setEnabled(true);
+                findViewById(R.id.signUpButton).setEnabled(true);
                 findViewById(R.id.deleteAttribute).setEnabled(true);
                 findViewById(R.id.anonloginButton).setEnabled(true);
                 findViewById(R.id.getAllAttributes).setEnabled(true);
@@ -377,6 +516,9 @@ public void run() {
                 findViewById(R.id.putAttribute).setEnabled(true);
                 findViewById(R.id.editAttrName).setEnabled(true);
                 findViewById(R.id.editAttrValue).setEnabled(true);
+                findViewById(R.id.changePasswordButton).setEnabled(true);
+                findViewById(R.id.changeDetailsButton).setEnabled(true);
+                findViewById(R.id.forgotPassword).setEnabled(true);
             }
         });
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 984e70a..0cb6456 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="52dp"
             android:layout_alignParentStart="true">
 
             <Button
@@ -41,19 +41,18 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="82dp"
-            android:orientation="horizontal"
-            android:layout_weight="0.05">
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
             <Button
-                android:id="@+id/anonloginButton"
+                android:id="@+id/signUpButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:layout_below="@+id/profilePic"
                 android:layout_weight="1"
-                android:onClick="onAnonLoginClick"
-                android:text="Use Anonymously"
+                android:onClick="onSignUpClick"
+                android:text="launch sign up only"
                 android:textSize="12sp" />
 
             <Button
@@ -79,7 +78,8 @@
                 android:layout_below="@+id/name"
                 android:layout_weight="1"
                 android:onClick="onLoginClick"
-                android:text="Launch Login widget" />
+                android:text="Launch Login widget"
+                android:textSize="14sp" />
 
             <Button
                 android:id="@+id/protectedRequestButton"
@@ -94,6 +94,56 @@
                 android:textSize="12sp" />
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/forgotPassword"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/profilePic"
+                android:layout_weight="1"
+                android:onClick="onForgotPasswordClick"
+                android:text="forgot password"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/anonloginButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/profilePic"
+                android:layout_weight="1"
+                android:onClick="onAnonLoginClick"
+                android:text="use anonymously"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/changePasswordButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/orText"
+                android:layout_weight="1"
+                android:onClick="onChangePasswordClick"
+                android:text="change password"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/changeDetailsButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/orText"
+                android:layout_weight="1"
+                android:onClick="onChangeDetailsClick"
+                android:text="change details"
+                android:textSize="13sp" />
+        </LinearLayout>
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="88dp"
diff --git a/lib/build.gradle b/lib/build.gradle
index 768dd5f..16ba53c 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -45,7 +45,13 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
-    compile 'com.ibm.mobilefirstplatform.clientsdk.android:core:2.2.7'
+
+    compile 'com.android.support:multidex:1.0.0'
+    compile 'com.squareup.okhttp3:okhttp:3.9.0'
+    compile 'com.squareup.okhttp3:okhttp-urlconnection:3.9.0'
+    compile 'com.ibm.mobilefirstplatform.clientsdk.android:analyticsapi:[1.0.0,)'
+    compile 'com.ibm.mobilefirstplatform.clientsdk.android:core:3.1.0@aar'
+
     compile 'com.android.support:appcompat-v7:25.1.0'
     compile 'com.android.support:customtabs:25.1.0'
     compile 'org.jetbrains:annotations-java5:15.0'
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
index 8f74678..3ec3bef 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
@@ -16,6 +16,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
+import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
 import com.ibm.bluemix.appid.android.api.userattributes.UserAttributeManager;
 import com.ibm.bluemix.appid.android.internal.OAuthManager;
 import com.ibm.bluemix.appid.android.internal.loginwidget.LoginWidgetImpl;
@@ -141,6 +142,7 @@ public void loginAnonymously(@NotNull Context context, String accessToken, @NotN
 	public void loginAnonymously(@NotNull Context context,  String accessToken, boolean allowCreateNewAnonymousUser, @NotNull AuthorizationListener authorizationListener){
 		oAuthManager.getAuthorizationManager().loginAnonymously(context, accessToken, allowCreateNewAnonymousUser, authorizationListener);
 	}
+
 	/**
 	 * Obtain token using Resource owner Password (RoP).
 	 *
@@ -149,8 +151,27 @@ public void loginAnonymously(@NotNull Context context,  String accessToken, bool
 	 * @param tokenResponseListener the token response listener
 	 */
 	public void obtainTokensWithROP(@NotNull Context context, @NotNull String username, @NotNull String password, @NotNull TokenResponseListener tokenResponseListener) {
-		oAuthManager.getAuthorizationManager().obtainTokensWithROP(context, username, password, tokenResponseListener);
+        AccessToken accessToken = oAuthManager.getTokenManager().getLatestAccessToken();
+		if (accessToken != null && accessToken.isAnonymous()) {
+			oAuthManager.getAuthorizationManager().obtainTokensWithROP(context, username, password, accessToken.getRaw(), tokenResponseListener);
+		}
+		oAuthManager.getAuthorizationManager().obtainTokensWithROP(context, username, password, null, tokenResponseListener);
 	}
 
+    /**
+     * Obtain token using Resource owner Password (RoP).
+     *
+     * @param username the resource owner username
+     * @param password the resource owner password
+     * @param tokenResponseListener the token response listener
+     * @param accessTokenString previous access token of some anonymous user
+     */
+	public void obtainTokensWithROP(@NotNull Context context, @NotNull String username, @NotNull String password, @NotNull TokenResponseListener tokenResponseListener, String accessTokenString) {
+        if(accessTokenString == null) {
+			obtainTokensWithROP(context, username, password, tokenResponseListener);
+		} else {
+            oAuthManager.getAuthorizationManager().obtainTokensWithROP(context, username, password, accessTokenString, tokenResponseListener);
+		}
+	}
 
 }
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager.java
index f0137e7..7479494 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager.java
@@ -165,6 +165,12 @@ public AppIdentity getAppIdentity () {
 		return new BaseAppIdentity(map);
 	}
 
+	/**
+	 * log out
+	 * @param context
+	 * @param listener
+	 * currently just call to clearAuthorizationData()
+	 */
 	@Override
 	public void logout (Context context, ResponseListener listener) {
 		logger.debug("logout");
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/LoginWidget.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/LoginWidget.java
index 202c6da..ce17acf 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/LoginWidget.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/LoginWidget.java
@@ -25,5 +25,29 @@ public interface LoginWidget {
 	 */
 	void launch (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener, String accessTokenString);
 	void launch (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener);
+    /**
+     * Launch only the sign up user interface
+     * @param activity Parent activity
+     * @param authorizationListener
+     */
+    void launchSignUp (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener);
+	/**
+	 * Launch the change password user interface
+	 * @param activity Parent activity
+	 * @param authorizationListener
+	 */
+	void launchChangePassword (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener);
+	/**
+	 * Launch the change details user interface
+	 * @param activity Parent activity
+	 * @param authorizationListener
+	 */
+	void launchChangeDetails (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener);
+	/**
+	 * Launch the forgot password user interface
+	 * @param activity Parent activity
+	 * @param authorizationListener
+	 */
+	void launchForgotPassword (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener);
 }
 
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
index 9d34ac4..426db1c 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
@@ -16,12 +16,14 @@
 import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
+import android.support.annotation.VisibleForTesting;
 
 import com.ibm.bluemix.appid.android.api.AppID;
 import com.ibm.bluemix.appid.android.api.AuthorizationException;
 import com.ibm.bluemix.appid.android.api.AuthorizationListener;
 import com.ibm.bluemix.appid.android.api.TokenResponseListener;
 import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
 import com.ibm.bluemix.appid.android.internal.OAuthManager;
 import com.ibm.bluemix.appid.android.internal.config.Config;
 import com.ibm.bluemix.appid.android.internal.network.AppIDRequest;
@@ -34,167 +36,335 @@
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
 import com.ibm.mobilefirstplatform.clientsdk.android.logger.api.Logger;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 public class AuthorizationManager {
-	private static final String OAUTH_AUTHORIZATION_PATH = "/authorization";
+    private final static String OAUTH_AUTHORIZATION_PATH = "/authorization";
+    private final static String CHANGE_PASSWORD_PATH = "/cloud_directory/change_password";
+    private final static String CHANGE_DETAILS_PATH = "/cloud_directory/change_details";
+    private final static String GENERATE_CODE_PATH = "/cloud_directory/generate_code";
+    private final static String FORGOT_PASSWORD_PATH = "/cloud_directory/forgot_password";
 
-	private final AppID appId;
-	private final OAuthManager oAuthManager;
-	private final RegistrationManager registrationManager;
+    private final AppID appId;
+    private final OAuthManager oAuthManager;
+    private final RegistrationManager registrationManager;
 
-	private AppIDRequestFactory appIDRequestFactory = new AppIDRequestFactory();
+    private AppIDRequestFactory appIDRequestFactory = new AppIDRequestFactory();
 
-	private final static String CLIENT_ID = "client_id";
-	private final static String RESPONSE_TYPE = "response_type";
-	private final static String RESPONSE_TYPE_CODE = "code";
+    private final static String CLIENT_ID = "client_id";
+    private final static String RESPONSE_TYPE = "response_type";
+    private final static String RESPONSE_TYPE_CODE = "code";
+    private final static String RESPONSE_TYPE_SIGN_UP = "sign_up";
+    private final static String USER_ID = "user_id";
 
-	private final static String SCOPE = "scope";
-	private final static String SCOPE_OPENID = "openid";
+    private final static String SCOPE = "scope";
+    private final static String SCOPE_OPENID = "openid";
 
-	private final static String REDIRECT_URI = "redirect_uri";
-	private final static String IDP = "idp";
-	private final static String APPID_ACCESS_TOKEN = "appid_access_token";
+    private final static String REDIRECT_URI = "redirect_uri";
+    private final static String IDP = "idp";
+    private final static String APPID_ACCESS_TOKEN = "appid_access_token";
+    private final static String ID = "id";
+    private final static String PROVIDER = "provider";
+    private final static String CLOUD_DIRECTORY_IDP = "cloud_directory";
+    private final static String CODE = "code";
 
-	private String serverUrl;
+    private String serverUrl;
 
-	private final static Logger logger = Logger.getLogger(Logger.INTERNAL_PREFIX + AuthorizationManager.class.getName());
+    private final static Logger logger = Logger.getLogger(Logger.INTERNAL_PREFIX + AuthorizationManager.class.getName());
 
     /**
      * @param oAuthManager
-     * @param ctx the Context that will be bind to the custom chrome tab.
-     * The AuthorizationManager constructor.
+     * @param ctx          the Context that will be bind to the custom chrome tab.
+     *                     The AuthorizationManager constructor.
      */
-	public AuthorizationManager (final OAuthManager oAuthManager, final Context ctx) {
-		this.oAuthManager = oAuthManager;
-		this.appId = oAuthManager.getAppId();
-		this.registrationManager = oAuthManager.getRegistrationManager();
-		this.serverUrl = Config.getOAuthServerUrl(this.appId) + OAUTH_AUTHORIZATION_PATH;
-		AuthorizationUIManager.bindCustomTabsService(ctx, serverUrl);
-	}
+    public AuthorizationManager(final OAuthManager oAuthManager, final Context ctx) {
+        this.oAuthManager = oAuthManager;
+        this.appId = oAuthManager.getAppId();
+        this.registrationManager = oAuthManager.getRegistrationManager();
+        this.serverUrl = Config.getOAuthServerUrl(this.appId) + OAUTH_AUTHORIZATION_PATH;
+        AuthorizationUIManager.bindCustomTabsService(ctx, serverUrl);
+    }
 
     /**
      * @return The Authorization endpoint url.
      */
-	private String getAuthorizationUrl(String idpName, AccessToken accessToken) {
-		String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
-		String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
-
-		Uri.Builder builder = Uri.parse(serverUrl).buildUpon()
-				.appendQueryParameter(RESPONSE_TYPE, RESPONSE_TYPE_CODE)
-				.appendQueryParameter(CLIENT_ID, clientId)
-				.appendQueryParameter(REDIRECT_URI, redirectUri)
-				.appendQueryParameter(SCOPE, SCOPE_OPENID);
-
-		if (idpName != null){
-			builder.appendQueryParameter(IDP, idpName);
-		}
-		if (accessToken != null){
-			builder.appendQueryParameter(APPID_ACCESS_TOKEN, accessToken.getRaw());
-		}
-		return builder.build().toString();
-	}
-
-	public void launchAuthorizationUI (final Activity activity, final AuthorizationListener authorizationListener){
-		launchAuthorizationUI(activity, null, authorizationListener);
-	}
+    private String getAuthorizationUrl(String idpName, AccessToken accessToken, String responseType) {
+        String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
+        String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
+
+        Uri.Builder builder = Uri.parse(serverUrl).buildUpon()
+                .appendQueryParameter(RESPONSE_TYPE, responseType)
+                .appendQueryParameter(CLIENT_ID, clientId)
+                .appendQueryParameter(REDIRECT_URI, redirectUri)
+                .appendQueryParameter(SCOPE, SCOPE_OPENID);
+
+        if (idpName != null) {
+            builder.appendQueryParameter(IDP, idpName);
+        }
+        if (accessToken != null) {
+            builder.appendQueryParameter(APPID_ACCESS_TOKEN, accessToken.getRaw());
+        }
+        return builder.build().toString();
+    }
 
     /**
-     * @param activity the activity to launch the chrome tab on to.
-     * @param accessToken if not null, this access token will be added to the request.
+     * @return the change password endpoint url.
+     */
+    private String getChangePasswordUrl(String userId, String redirectUri) {
+        String changePasswordEndpoint = Config.getOAuthServerUrl(this.appId) + CHANGE_PASSWORD_PATH;
+        return buildUrl(changePasswordEndpoint, userId, redirectUri, null);
+    }
+    /**
+     * @return the change details endpoint url.
+     */
+    private String getChangeDetailsUrl(String redirectUri, String code) {
+        String changeDetailsEndpoint = Config.getOAuthServerUrl(this.appId) + CHANGE_DETAILS_PATH;
+        return buildUrl(changeDetailsEndpoint, null, redirectUri, code);
+    }
+    /**
+     * @return the forgot password endpoint url.
+     */
+    private String getForgotPasswordUrl(String redirectUri) {
+        String forgotPasswordEndpoint = Config.getOAuthServerUrl(this.appId) + FORGOT_PASSWORD_PATH;
+        return buildUrl(forgotPasswordEndpoint, null, redirectUri, null);
+    }
+    private String buildUrl(String endpointUrl, String userId, String redirectUri, String code) {
+        String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
+        Uri.Builder builder = Uri.parse(endpointUrl).buildUpon();
+        if (null != clientId) {
+            builder.appendQueryParameter(CLIENT_ID, clientId);
+        }
+        if (null != redirectUri) {
+            builder.appendQueryParameter(REDIRECT_URI, redirectUri);
+        }
+        if (null != code) {
+            builder.appendQueryParameter(CODE, code);
+        }
+        if (null != userId) {
+            builder.appendQueryParameter(USER_ID, userId);
+        }
+        return builder.build().toString();
+    }
+
+    public void launchAuthorizationUI(final Activity activity, final AuthorizationListener authorizationListener) {
+        launchAuthorizationUI(activity, null, authorizationListener);
+    }
+
+    /**
+     * @param activity              the activity to launch the chrome tab on to.
+     * @param accessToken           if not null, this access token will be added to the request.
      * @param authorizationListener the authorization listener of the client.
-     * launch the authorization url in the chrome tab after successful registration.
+     *                              launch the authorization url in the chrome tab after successful registration.
      */
-	public void launchAuthorizationUI (final Activity activity, final AccessToken accessToken, final AuthorizationListener authorizationListener){
-		registrationManager.ensureRegistered(activity, new RegistrationListener() {
-			@Override
-			public void onRegistrationFailure (RegistrationStatus error) {
-				logger.error(error.getDescription());
-				authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
-			}
-
-			@Override
-			public void onRegistrationSuccess () {
-				String authorizationUrl = getAuthorizationUrl(null, accessToken);
-				String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
-				AuthorizationUIManager auim = new AuthorizationUIManager(oAuthManager, authorizationListener, authorizationUrl, redirectUri);
-				auim.launch(activity);
-			}
-		});
-	}
-
-	private void continueAnonymousLogin (String accessTokenString, boolean allowCreateNewAnonymousUser, final AuthorizationListener listener){
-		AccessToken accessToken;
-		if (accessTokenString == null){
-			accessToken = oAuthManager.getTokenManager().getLatestAccessToken();
-		} else {
-			accessToken = new AccessTokenImpl(accessTokenString);
-		}
-
-		if (accessToken == null && !allowCreateNewAnonymousUser){
-			listener.onAuthorizationFailure(new AuthorizationException("Not allowed to create new anonymous users"));
-			return;
-		}
-
-		String authorizationUrl = getAuthorizationUrl(AccessTokenImpl.IDP_ANONYMOUS, accessToken);
-
-		AppIDRequest request = appIDRequestFactory.createRequest(authorizationUrl, AppIDRequest.GET);
-		request.send(new ResponseListener(){
-						 @Override
-						 public void onSuccess(Response response) {
-							 logger.debug("loginAnonymously.Response in onSuccess:" + response.getResponseText());
-							 String location = response.getHeaders().get("Location").toString();
-							 String locationUrl = location.substring(1,location.length()-1); // removing []
-							 String code = Uri.parse(locationUrl).getQueryParameter("code");
-							 oAuthManager.getTokenManager().obtainTokens(code, listener);
-						 }
-
-						 @Override
-						 public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
-							 String message = (response == null) ? "" : response.getResponseText();
-							 logger.debug("loginAnonymously.Response in onFailure:" + message, t);
-							 message = (t != null) ? t.getLocalizedMessage() : "Authorization request failed.";
-							 message = (extendedInfo != null) ? message + extendedInfo.toString() : message;
-							 listener.onAuthorizationFailure(new AuthorizationException(message));
-						 }
-					 }
-		);
-	}
-
-	public void loginAnonymously(final Context context, final String accessTokenString, final boolean allowCreateNewAnonymousUser, final AuthorizationListener authorizationListener){
-		registrationManager.ensureRegistered(context, new RegistrationListener() {
-			@Override
-			public void onRegistrationFailure (RegistrationStatus error) {
-				logger.error(error.getDescription());
+    public void launchAuthorizationUI(final Activity activity, final AccessToken accessToken, final AuthorizationListener authorizationListener) {
+        registrationManager.ensureRegistered(activity, new RegistrationListener() {
+            @Override
+            public void onRegistrationFailure(RegistrationStatus error) {
+                logger.error(error.getDescription());
                 authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
-			}
-
-			@Override
-			public void onRegistrationSuccess () {
-				continueAnonymousLogin(accessTokenString, allowCreateNewAnonymousUser, authorizationListener);
-			}
-		});
-	}
-
-	public void setAppIDRequestFactory(AppIDRequestFactory appIDRequestFactory) {
-		this.appIDRequestFactory = appIDRequestFactory;
-	}
-
-	public void obtainTokensWithROP(final Context context, final String username, final String password, final TokenResponseListener tokenResponseListener) {
-		registrationManager.ensureRegistered(context, new RegistrationListener() {
-			@Override
-			public void onRegistrationFailure (RegistrationStatus error) {
-				logger.error(error.getDescription());
-				tokenResponseListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
-			}
-
-			@Override
-			public void onRegistrationSuccess () {
-				oAuthManager.getTokenManager().obtainTokens(username, password, tokenResponseListener);
-			}
-		});
-	}
+            }
+
+            @Override
+            public void onRegistrationSuccess() {
+                String authorizationUrl = getAuthorizationUrl(null, accessToken, RESPONSE_TYPE_CODE);
+                String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
+                AuthorizationUIManager auim = createAuthorizationUIManager(oAuthManager, authorizationListener, authorizationUrl, redirectUri);
+                auim.launch(activity);
+            }
+        });
+    }
 
+    /**
+     * @param activity              the activity to launch the chrome tab on to.
+     * @param authorizationListener the authorization listener of the client.
+     *                              launch the authorization url with response_type=sign_up in the chrome tab after successful registration.
+     */
+    public void launchSignUpAuthorizationUI(final Activity activity, final AuthorizationListener authorizationListener) {
+        registrationManager.ensureRegistered(activity, new RegistrationListener() {
+            @Override
+            public void onRegistrationFailure(RegistrationStatus error) {
+                logger.error(error.getDescription());
+                authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
+            }
+
+            @Override
+            public void onRegistrationSuccess() {
+                String signUpAuthorizationUrl = getAuthorizationUrl(null, null, RESPONSE_TYPE_SIGN_UP);
+                String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
+                AuthorizationUIManager auim = createAuthorizationUIManager(oAuthManager, authorizationListener, signUpAuthorizationUrl, redirectUri);
+                auim.launch(activity);
+            }
+        });
+    }
+
+    /**
+     * @param activity              the activity to launch the chrome tab on to.
+     * @param authorizationListener the authorization listener of the client.
+     *                              Launch the change password UI in chrome tab only if the client logged-in otherwise return an error.
+     */
+    public void launchChangePasswordUI(final Activity activity, final AuthorizationListener authorizationListener) {
+        try {
+            IdentityToken currentIdToken = this.oAuthManager.getTokenManager().getLatestIdentityToken();
+            if (currentIdToken == null) {
+                authorizationListener.onAuthorizationFailure(new AuthorizationException("No identity token found."));
+            } else if (!CLOUD_DIRECTORY_IDP.equals(currentIdToken.getIdentities().getJSONObject(0).getString(PROVIDER))) {
+                authorizationListener.onAuthorizationFailure(new AuthorizationException("The identity token was not retrieved using cloud directory idp."));
+            } else {
+                String userId = currentIdToken.getIdentities().getJSONObject(0).getString(ID);
+                String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
+                String changePasswordUrl = getChangePasswordUrl(userId, redirectUri);
+                AuthorizationUIManager auim = createAuthorizationUIManager(oAuthManager, authorizationListener, changePasswordUrl, redirectUri);
+                auim.launch(activity);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+            authorizationListener.onAuthorizationFailure(new AuthorizationException(e.getMessage()));
+        }
+    }
+
+    /**
+     * @param activity              the activity to launch the chrome tab on to.
+     * @param authorizationListener the authorization listener of the client.
+     *                              Launch the change details UI in chrome tab only if the client logged-in otherwise return an error.
+     */
+    public void launchChangeDetailsUI(final Activity activity, final AuthorizationListener authorizationListener) {
+        try {
+            final IdentityToken currentIdToken = this.oAuthManager.getTokenManager().getLatestIdentityToken();
+            if (currentIdToken == null) {
+                authorizationListener.onAuthorizationFailure(new AuthorizationException("No identity token found."));
+            } else if (!CLOUD_DIRECTORY_IDP.equals(currentIdToken.getIdentities().getJSONObject(0).getString(PROVIDER))) {
+                authorizationListener.onAuthorizationFailure(new AuthorizationException("The identity token was not retrieved using cloud directory idp."));
+            } else {
+                String generateCodeURL = Config.getOAuthServerUrl(this.appId) + GENERATE_CODE_PATH;
+                AppIDRequest request = appIDRequestFactory.createRequest(generateCodeURL, AppIDRequest.GET);
+                request.send(new ResponseListener() {
+                    @Override
+                    public void onSuccess(Response response) {
+                        logger.info("Code request success");
+                        String code = response.getResponseText();
+                        String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
+                        String changeDetailsUrl = getChangeDetailsUrl(redirectUri, code);
+                        AuthorizationUIManager auim = createAuthorizationUIManager(oAuthManager, authorizationListener, changeDetailsUrl, redirectUri);
+                        auim.launch(activity);
+                    }
+
+                    @Override
+                    public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
+                        String errorMsg = "Code request failure ";
+                        if (response != null) {
+                            errorMsg += ",response: " + response.toString();
+                        } else if (extendedInfo != null) {
+                            errorMsg += " ,extendedInfo: " + extendedInfo.toString();
+                        } else if (t != null) {
+                            errorMsg += " ,exception: " + t.getMessage();
+                        }
+                        logger.error(errorMsg);
+                        authorizationListener.onAuthorizationFailure(new AuthorizationException(errorMsg));
+                    }
+                }, this.oAuthManager.getTokenManager().getLatestAccessToken(), this.oAuthManager.getTokenManager().getLatestIdentityToken());
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+            authorizationListener.onAuthorizationFailure(new AuthorizationException(e.getMessage()));
+        }
+    }
+
+    public void launchForgotPasswordUI(final Activity activity, final AuthorizationListener authorizationListener) {
+        registrationManager.ensureRegistered(activity, new RegistrationListener() {
+            @Override
+            public void onRegistrationFailure(RegistrationStatus error) {
+                logger.error(error.getDescription());
+                authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
+            }
+
+            @Override
+            public void onRegistrationSuccess() {
+                String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
+                String forgotPasswordUrl = getForgotPasswordUrl(redirectUri);
+                AuthorizationUIManager auim = createAuthorizationUIManager(oAuthManager, authorizationListener, forgotPasswordUrl, redirectUri);
+                auim.launch(activity);
+            }
+        });
+
+    }
+
+    @VisibleForTesting
+    AuthorizationUIManager createAuthorizationUIManager(OAuthManager oAuthManager, AuthorizationListener authorizationListener, String authUrl, String redirectUri) {
+        return new AuthorizationUIManager(oAuthManager, authorizationListener, authUrl, redirectUri);
+    }
+
+    private void continueAnonymousLogin(String accessTokenString, boolean allowCreateNewAnonymousUser, final AuthorizationListener listener) {
+        AccessToken accessToken;
+        if (accessTokenString == null) {
+            accessToken = oAuthManager.getTokenManager().getLatestAccessToken();
+        } else {
+            accessToken = new AccessTokenImpl(accessTokenString);
+        }
+
+        if (accessToken == null && !allowCreateNewAnonymousUser) {
+            listener.onAuthorizationFailure(new AuthorizationException("Not allowed to create new anonymous users"));
+            return;
+        }
+
+        String authorizationUrl = getAuthorizationUrl(AccessTokenImpl.IDP_ANONYMOUS, accessToken, RESPONSE_TYPE_CODE);
+
+        AppIDRequest request = appIDRequestFactory.createRequest(authorizationUrl, AppIDRequest.GET);
+        request.send(new ResponseListener() {
+                         @Override
+                         public void onSuccess(Response response) {
+                             logger.debug("loginAnonymously.Response in onSuccess:" + response.getResponseText());
+                             String location = response.getHeaders().get("Location").toString();
+                             String locationUrl = location.substring(1, location.length() - 1); // removing []
+                             String code = Uri.parse(locationUrl).getQueryParameter("code");
+                             oAuthManager.getTokenManager().obtainTokens(code, listener);
+                         }
+
+                         @Override
+                         public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
+                             String message = (response == null) ? "" : response.getResponseText();
+                             logger.debug("loginAnonymously.Response in onFailure:" + message, t);
+                             message = (t != null) ? t.getLocalizedMessage() : "Authorization request failed.";
+                             message = (extendedInfo != null) ? message + extendedInfo.toString() : message;
+                             listener.onAuthorizationFailure(new AuthorizationException(message));
+                         }
+                     }
+        );
+    }
+
+    public void loginAnonymously(final Context context, final String accessTokenString, final boolean allowCreateNewAnonymousUser, final AuthorizationListener authorizationListener) {
+        registrationManager.ensureRegistered(context, new RegistrationListener() {
+            @Override
+            public void onRegistrationFailure(RegistrationStatus error) {
+                logger.error(error.getDescription());
+                authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
+            }
+
+            @Override
+            public void onRegistrationSuccess() {
+                continueAnonymousLogin(accessTokenString, allowCreateNewAnonymousUser, authorizationListener);
+            }
+        });
+    }
+
+    public void setAppIDRequestFactory(AppIDRequestFactory appIDRequestFactory) {
+        this.appIDRequestFactory = appIDRequestFactory;
+    }
+
+    public void obtainTokensWithROP(final Context context, final String username, final String password, final String accessTokenString, final TokenResponseListener tokenResponseListener) {
+        registrationManager.ensureRegistered(context, new RegistrationListener() {
+            @Override
+            public void onRegistrationFailure(RegistrationStatus error) {
+                logger.error(error.getDescription());
+                tokenResponseListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
+            }
+
+            @Override
+            public void onRegistrationSuccess() {
+                oAuthManager.getTokenManager().obtainTokens(username, password, accessTokenString, tokenResponseListener);
+            }
+        });
+    }
 
 
 }
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
index db08061..7d25d4b 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
@@ -83,7 +83,7 @@ public void launch(final Activity activity) {
         AuthorizationFlowContextStore.push(authFlowContextGuid, ctx);
 
         // If we cant find a package name, it means there's no browser that supports
-        // Chrome Custom Tabs installed. So, we fallback to the WebView
+        // Chrome Custom Tabs installed.
         // (There might be a browser other than Chrome that support Chrome tabs)
 
         if (getPackageNameToUse(context) == null || !isChromeTabSupported) {
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/ChromeTabActivity.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/ChromeTabActivity.java
index 5c93ee8..8a059f6 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/ChromeTabActivity.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/ChromeTabActivity.java
@@ -24,7 +24,6 @@
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.LocalBroadcastManager;
 
-
 import com.ibm.bluemix.appid.android.api.AuthorizationException;
 import com.ibm.bluemix.appid.android.api.AuthorizationListener;
 import com.ibm.bluemix.appid.android.internal.OAuthManager;
@@ -38,6 +37,9 @@ public class ChromeTabActivity extends Activity {
     private static final String INTENT_ALREADY_USED = "com.ibm.bluemix.appid.android.INTENT_ALREADY_USED";
     private String postAuthorizationIntent = ".POST_AUTHORIZATION_INTENT";
 
+    private static String FORGOT_PASSWORD = "forgot_password";
+    private static String SIGN_UP = "sign_up";
+
     private BroadcastReceiver broadcastReceiver;
     private AuthorizationListener authorizationListener;
     private OAuthManager oAuthManager;
@@ -98,6 +100,7 @@ private void onBroadcastReceived(Intent intent) {
         String url = uri.toString();
         String code = uri.getQueryParameter("code");
         String error = uri.getQueryParameter("error");
+        String flow = uri.getQueryParameter("flow");
 
         logger.info("onBroadcastReceived: " + url);
 
@@ -121,6 +124,14 @@ private void onBroadcastReceived(Intent intent) {
                 authorizationListener.onAuthorizationFailure(new AuthorizationException("Failed to obtain access and identity tokens"));
                 startActivity(clearTopActivityIntent);
             }
+        } else if (url.startsWith(redirectUrl) && (FORGOT_PASSWORD.equals(flow) || SIGN_UP.equals(flow))) {
+            logger.debug("onBroadcastReceived: end of flow: " + flow);
+            authorizationListener.onAuthorizationSuccess(null, null);
+            startActivity(clearTopActivityIntent);
+        } else {
+            logger.debug("onBroadcastReceived: no match case");
+            authorizationListener.onAuthorizationFailure(new AuthorizationException("Bad callback uri"));
+            startActivity(clearTopActivityIntent);
         }
     }
 
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl.java
index 9dff770..dcaa306 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl.java
@@ -32,7 +32,7 @@ public LoginWidgetImpl(@NonNull OAuthManager oAuthManager){
 
 
 	public void launch(@NonNull Activity activity, @NonNull AuthorizationListener authorizationListener, String accessTokenString) {
-		if(accessTokenString == null){
+		if(accessTokenString == null) {
 			launch(activity, authorizationListener);
 			return;
 		}
@@ -50,5 +50,37 @@ public void launch (@NonNull final Activity activity, @NonNull final Authorizati
 				oAuthManager.getTokenManager().getLatestAccessToken(),
 				authorizationListener);
 	}
+
+	/**
+	 * @param activity
+     * @param authorizationListener
+	 */
+	public void launchSignUp (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener) {
+        oAuthManager.getAuthorizationManager().launchSignUpAuthorizationUI(activity, authorizationListener);
+	}
+
+	/**
+	 * @param activity
+	 * @param authorizationListener
+	 */
+	public void launchChangePassword (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener) {
+		oAuthManager.getAuthorizationManager().launchChangePasswordUI(activity, authorizationListener);
+	}
+
+	/**
+	 * @param activity
+	 * @param authorizationListener
+	 */
+	public void launchChangeDetails (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener) {
+		oAuthManager.getAuthorizationManager().launchChangeDetailsUI(activity, authorizationListener);
+	}
+
+	/**
+	 * @param activity
+	 * @param authorizationListener
+	 */
+	public void launchForgotPassword (@NonNull final Activity activity, @NonNull final AuthorizationListener authorizationListener) {
+		oAuthManager.getAuthorizationManager().launchForgotPasswordUI(activity, authorizationListener);
+	}
 }
 
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest.java
index 3bf6c7a..2f67992 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest.java
@@ -14,32 +14,59 @@
 package com.ibm.bluemix.appid.android.internal.network;
 
 import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.internal.BaseRequest;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.internal.TLSEnabledSSLSocketFactory;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.RequestBody;
+import com.ibm.mobilefirstplatform.clientsdk.android.logger.api.Logger;
+
+import okhttp3.RequestBody;
+import okhttp3.OkHttpClient;
 
 import org.json.JSONObject;
 
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.util.Map;
 
 import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.X509TrustManager;
+import javax.net.ssl.TrustManager;
 
 public class AppIDRequest extends BaseRequest {
-	private static OkHttpClient httpClient = new OkHttpClient();
+	private static Logger logger = Logger.getLogger(Logger.INTERNAL_PREFIX + BaseRequest.class.getSimpleName());
+	private static  OkHttpClient.Builder httpClient = new OkHttpClient.Builder();
 
 	static {
 		SSLSocketFactory tlsEnabledSSLSocketFactory;
 		try {
+			final TrustManager[] trustAllCerts = new TrustManager[]{
+					new X509TrustManager() {
+						@Override
+						public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+							logger.info("AppIDRequest checkClientTrusted method : " + authType);
+						}
+
+						@Override
+						public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+							logger.info("AppIDRequest checkServerTrusted method : " + authType);
+						}
+
+						@Override
+						public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+							return new java.security.cert.X509Certificate[]{};
+						}
+					}
+			};
 			tlsEnabledSSLSocketFactory = new TLSEnabledSSLSocketFactory();
-			httpClient.setSslSocketFactory(tlsEnabledSSLSocketFactory);
+			httpClient.sslSocketFactory(tlsEnabledSSLSocketFactory, (X509TrustManager) trustAllCerts[0]);
 		} catch (KeyManagementException e) {
 			e.printStackTrace();
 		} catch (NoSuchAlgorithmException e) {
 			e.printStackTrace();
+		} catch (RuntimeException e) {
+			logger.error("AppIDRequest RuntimeException : " + e.getLocalizedMessage());
 		}
 	}
 
@@ -53,7 +80,15 @@ public AppIDRequest (String url, String method) {
 		super(url, method);
 
 		// we want to handle redirects in-place
-		httpClient.setFollowRedirects(false);
+		httpClient.followSslRedirects(false);
+	}
+
+	public void send(final ResponseListener listener, final AccessToken accessToken, final IdentityToken identityToken) {
+        if (accessToken != null && identityToken != null) {
+            removeHeaders("Authorization");
+            addHeader("Authorization", "Bearer " + accessToken.getRaw() + " " + identityToken.getRaw());
+        }
+        send(listener);
 	}
 
 	public void send(final ResponseListener listener, final RequestBody requestBody, final AccessToken accessToken) {
@@ -63,9 +98,9 @@ public void send(final ResponseListener listener, final RequestBody requestBody,
 			addHeader("Authorization", "Bearer " + accessToken.getRaw());
 		}
 
-		if (requestBody != null){
-			super.sendRequest(listener, requestBody);
-		}else{
+		if (requestBody != null) {
+			super.sendRequest(null, listener, requestBody);
+		} else {
 			send(listener);
 		}
 	}
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/registrationmanager/RegistrationManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/registrationmanager/RegistrationManager.java
index 45b884d..e30c760 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/registrationmanager/RegistrationManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/registrationmanager/RegistrationManager.java
@@ -55,6 +55,7 @@ public class RegistrationManager {
 	public static final String DEVICE_ID = "device_id";
 	public static final String DEVICE_MODEL = "device_model";
 	public static final String DEVICE_OS = "device_os";
+	public static final String DEVICE_OS_VERSION = "device_os_version";
 	public static final String CLIENT_TYPE = "client_type";
 	public static final String REDIRECT_URIS = "redirect_uris";
 
@@ -179,6 +180,7 @@ private JSONObject createRegistrationParams(Context context) throws Exception {
         params.put(DEVICE_ID, deviceData.getId());
         params.put(DEVICE_MODEL, deviceData.getModel());
         params.put(DEVICE_OS, "android");
+		params.put(DEVICE_OS_VERSION, deviceData.getOSVersion());
         params.put(CLIENT_TYPE, "mobileapp");
         params.put("jwks", jwks);
 		logger.debug("OAuth client registration parameters");
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
index cae0793..9bd7dca 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
@@ -57,6 +57,7 @@ public class TokenManager {
     private final static String USERNAME = "username";
     private final static String PASSWORD = "password";
     private final static String GRANT_TYPE_PASSWORD = "password";
+	private final static String APPID_ACCESS_TOKEN = "appid_access_token";
     private final static String ERROR_DESCRIPTION= "error_description";
     private final static String ERROR_CODE= "error";
     private final static String INVALID_GRANT= "invalid_grant";
@@ -108,7 +109,7 @@ public void onFailure (Response response, Throwable t, JSONObject extendedInfo)
                         JSONObject responseJSON = new JSONObject(response.getResponseText());
                         if (INVALID_GRANT.equals(responseJSON.getString(ERROR_CODE))) {
                             errorDescription = responseJSON.getString(ERROR_DESCRIPTION);
-                            listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens: " + errorDescription));
+                            listener.onAuthorizationFailure(new AuthorizationException(errorDescription));
                             return;
                         }
                     }
@@ -126,14 +127,16 @@ public void onSuccess (Response response) {
 		});
 	}
 
-	public void obtainTokens (String username, String password, final TokenResponseListener listener) {
+	public void obtainTokens (String username, String password, String accessTokenString, final TokenResponseListener listener) {
 		logger.debug("obtainTokens - with resource owner password");
 
 		HashMap<String, String> formParams = new HashMap<>();
         formParams.put(USERNAME, username);
         formParams.put(PASSWORD, password);
         formParams.put(GRANT_TYPE, GRANT_TYPE_PASSWORD);
-
+		if (accessTokenString != null) {
+			formParams.put(APPID_ACCESS_TOKEN, accessTokenString);
+		}
 		retrieveTokens(formParams, listener);
 	}
 
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl.java
index 7927084..d889a28 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl.java
@@ -26,8 +26,8 @@
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
 import com.ibm.mobilefirstplatform.clientsdk.android.logger.api.Logger;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.RequestBody;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -141,8 +141,7 @@ public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
 			}
 		};
 
-		RequestBody requestBody =
-				(value == null || value.length() == 0) ? null : createRequestBody(value);
+		RequestBody requestBody = (value == null || value.length() == 0) ? null : createRequestBody(value);
 
 		req.send (resListener, requestBody, accessToken);
 	}
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager_Test.java
index f3bb71e..e1e7a05 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager_Test.java
@@ -214,7 +214,7 @@ public void onSuccess(Response response) {
 			public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
 				fail("should get to onSuccess");
 			}
-		}, null);
+		});
 	}
 
 	@Test
@@ -240,7 +240,7 @@ public void onSuccess(Response response) {
 			public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
 				assertEquals(t.getMessage(), "test exception");
 			}
-		}, null);
+		});
 	}
 
 	@Test
@@ -266,7 +266,7 @@ public void onSuccess(Response response) {
 			public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
 				assertEquals(t.getMessage(), "Authorization canceled");
 			}
-		}, null);
+		});
 	}
 
 }
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppID_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppID_Test.java
index dcb38a0..add3349 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppID_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppID_Test.java
@@ -20,6 +20,7 @@
 import com.ibm.bluemix.appid.android.internal.registrationmanager.RegistrationStatus;
 import com.ibm.bluemix.appid.android.internal.userattributesmanager.UserAttributeManagerImpl;
 import com.ibm.bluemix.appid.android.testing.helpers.ClassHelper;
+import com.ibm.bluemix.appid.android.testing.helpers.Consts;
 import com.ibm.mobilefirstplatform.appid_clientsdk_android.BuildConfig;
 
 import org.assertj.core.api.ThrowableAssert;
@@ -130,22 +131,59 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
 
 	@Test
 	public void test03_loginUsingRoP(){
-        this.appId.initialize(RuntimeEnvironment.application, testTenantId, testRegion);
+		this.appId.initialize(RuntimeEnvironment.application, testTenantId, testRegion);
 
-        TokenResponseListener listener = new TokenResponseListener() {
-            @Override
-            public void onAuthorizationFailure(AuthorizationException exception) {
-                assertThat(exception.getMessage().equals(RegistrationStatus.FAILED_TO_REGISTER.getDescription()));
-            }
+		TokenResponseListener listener = new TokenResponseListener() {
+			@Override
+			public void onAuthorizationFailure(AuthorizationException exception) {
+				assertThat(exception.getMessage().equals(RegistrationStatus.FAILED_TO_REGISTER.getDescription()));
+			}
 
-            @Override
-            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
-                assert(false);
-            }
-        };
+			@Override
+			public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+				assert(false);
+			}
+		};
+
+		appId.obtainTokensWithROP(RuntimeEnvironment.application, "testUsername", "testPassword", listener);
+	}
+
+	@Test
+	public void test04_loginUsingRoPWithNullAccessToken(){
+		this.appId.initialize(RuntimeEnvironment.application, testTenantId, testRegion);
 
-        appId.obtainTokensWithROP(RuntimeEnvironment.application, "testUsername", "testPassword", listener);
+		TokenResponseListener listener = new TokenResponseListener() {
+			@Override
+			public void onAuthorizationFailure(AuthorizationException exception) {
+				assertThat(exception.getMessage().equals(RegistrationStatus.FAILED_TO_REGISTER.getDescription()));
+			}
+
+			@Override
+			public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+				assert(false);
+			}
+		};
+
+		appId.obtainTokensWithROP(RuntimeEnvironment.application, "testUsername", "testPassword", listener, null);
+	}
+
+	@Test
+	public void test05_loginUsingRoPWithAccessToken(){
+		this.appId.initialize(RuntimeEnvironment.application, testTenantId, testRegion);
+
+		TokenResponseListener listener = new TokenResponseListener() {
+			@Override
+			public void onAuthorizationFailure(AuthorizationException exception) {
+				assertThat(exception.getMessage().equals(RegistrationStatus.FAILED_TO_REGISTER.getDescription()));
+			}
+
+			@Override
+			public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+				assert(false);
+			}
+		};
 
+		appId.obtainTokensWithROP(RuntimeEnvironment.application, "testUsername", "testPassword", listener, Consts.ACCESS_TOKEN);
 	}
 }
 
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
index 789b4d9..b1b108d 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
@@ -36,6 +36,8 @@
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -48,6 +50,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -58,6 +61,8 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.doAnswer;
 
@@ -84,14 +89,22 @@ public class AuthorizationManager_Test {
     private AppIDRequest mockRequest;
     @Mock
     private Activity mockActivity;
+    @Mock
+    private IdentityToken mockIdToken;
     private AuthorizationManager authManager;
     private String username = "testUser";
     private String password = "testPassword";
     private String testError = "Some Error";
+    private String code = "1234";
+    private String passedAccessToken = Consts.ACCESS_TOKEN;
     private static final AccessToken expectedAccessToken = new AccessTokenImpl(Consts.ACCESS_TOKEN);
     private static final IdentityToken expectedIdToken = new IdentityTokenImpl(Consts.ID_TOKEN);
-
     private Response testResponse = new Response() {
+        @Override
+        public String getRequestURL() {
+            return null;
+        }
+
         @Override
         public int getStatus() {
             return 0;
@@ -102,11 +115,70 @@ public String getResponseText() {
             return testError;
         }
 
+        @Override
+        public JSONObject getResponseJSON() {
+            return null;
+        }
+
+        @Override
+        public byte[] getResponseBytes() {
+            return new byte[0];
+        }
+
+        @Override
+        public InputStream getResponseByteStream() {
+            return null;
+        }
+
+        @Override
+        public long getContentLength() {
+            return 0;
+        }
+
+        @Override
+        public Map<String, List<String>> getHeaders() {
+            Map<String, List<String>> map =  new HashMap<String, List<String>>();
+            map.put("Location", new LinkedList<String>());
+            return map;
+        }
+    };
+
+    private Response testGoodResponse = new Response() {
+        @Override
+        public String getRequestURL() {
+            return null;
+        }
+
+        @Override
+        public int getStatus() {
+            return 200;
+        }
+
+        @Override
+        public String getResponseText() {
+            return code;
+        }
+
+        @Override
+        public JSONObject getResponseJSON() {
+            return null;
+        }
+
         @Override
         public byte[] getResponseBytes() {
             return new byte[0];
         }
 
+        @Override
+        public InputStream getResponseByteStream() {
+            return null;
+        }
+
+        @Override
+        public long getContentLength() {
+            return 0;
+        }
+
         @Override
         public Map<String, List<String>> getHeaders() {
             Map<String, List<String>> map =  new HashMap<String, List<String>>();
@@ -128,12 +200,12 @@ public void before() {
                      @Override
                      public Void answer(InvocationOnMock invocation) {
                          Object[] args = invocation.getArguments();
-                         TokenResponseListener tokenListener = (TokenResponseListener) args[2];
+                         TokenResponseListener tokenListener = (TokenResponseListener) args[3];
                          tokenListener.onAuthorizationSuccess(expectedAccessToken, expectedIdToken);
                          return null;
                      }
                  }
-        ).when(tokenManagerMock).obtainTokens(eq(username), eq(password), any(TokenResponseListener.class));
+        ).when(tokenManagerMock).obtainTokens(eq(username), eq(password), eq(passedAccessToken), any(TokenResponseListener.class));
 
         doAnswer(new Answer<Void>() {
                      @Override
@@ -147,6 +219,7 @@ public Void answer(InvocationOnMock invocation) {
         ).when(tokenManagerMock).obtainTokens(anyString(), any(AuthorizationListener.class));
 
         authManager = new AuthorizationManager(oAuthManagerMock, mockContext);
+        appidMock.overrideOAuthServerHost = null;
     }
 
     @Test
@@ -163,7 +236,7 @@ public Void answer(InvocationOnMock invocation) {
         }).when(registrationManager).ensureRegistered(eq(mockContext), any(RegistrationListener.class));
 
 
-        authManager.obtainTokensWithROP(mockContext, username, password, new TokenResponseListener() {
+        authManager.obtainTokensWithROP(mockContext, username, password, passedAccessToken, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
                 assertEquals(exception.getMessage(), RegistrationStatus.NOT_REGISTRED.getDescription());
@@ -188,7 +261,7 @@ public Void answer(InvocationOnMock invocation) {
                  }
         ).when(registrationManager).ensureRegistered(eq(mockContext), any(RegistrationListener.class));
 
-        authManager.obtainTokensWithROP(mockContext, username, password, new TokenResponseListener() {
+        authManager.obtainTokensWithROP(mockContext, username, password, passedAccessToken, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
                 fail("should get to onAuthorizationSuccess");
@@ -352,6 +425,74 @@ public void onAuthorizationCanceled() {
     @Test
     public void launchAuthorizationUI_success(){
 
+        final AuthorizationManager spyAuthManager = spy(authManager);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationSuccess();
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(mockActivity), any(RegistrationListener.class));
+
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchAuthorizationUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                String expectedAuthUrl = "https://appid-oauth.stubPrefix/oauth/v3/null/authorization?response_type=code&client_id=null&redirect_uri=null&scope=openid";
+                assertEquals(exception.getMessage(), "Could NOT find installed browser that support Chrome tabs on the device.");
+                verify(spyAuthManager).createAuthorizationUIManager(any(OAuthManager.class), any(AuthorizationListener.class), eq(expectedAuthUrl), anyString());
+
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchSignUpAuthorizationUI_failure(){
+        Activity activity = new Activity();
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationFailure(RegistrationStatus.NOT_REGISTRED);
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(activity), any(RegistrationListener.class));
+
+        authManager.launchSignUpAuthorizationUI(activity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), RegistrationStatus.NOT_REGISTRED.getDescription());
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchSigUpAuthorizationUI_success() throws Exception{
+
+        final AuthorizationManager spyAuthManager =  spy(authManager);
         doAnswer(new Answer<Void>() {
                      public Void answer(InvocationOnMock invocation) {
                          Object[] args = invocation.getArguments();
@@ -363,10 +504,35 @@ public Void answer(InvocationOnMock invocation) {
         ).when(registrationManager).ensureRegistered(eq(mockActivity), any(RegistrationListener.class));
 
         when(mockActivity.getApplicationContext()).thenReturn(mockContext);
-        authManager.launchAuthorizationUI(mockActivity, new AuthorizationListener() {
+        spyAuthManager.launchSignUpAuthorizationUI(mockActivity, new AuthorizationListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
+                String expectedAuthUrl = "https://appid-oauth.stubPrefix/oauth/v3/null/authorization?response_type=sign_up&client_id=null&redirect_uri=null&scope=openid";
                 assertEquals(exception.getMessage(), "Could NOT find installed browser that support Chrome tabs on the device.");
+                verify(spyAuthManager).createAuthorizationUIManager(any(OAuthManager.class), any(AuthorizationListener.class), eq(expectedAuthUrl), anyString());
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangePasswordUI_noIdToken() throws Exception {
+
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangePasswordUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "No identity token found.");
             }
 
             @Override
@@ -380,4 +546,382 @@ public void onAuthorizationCanceled() {
             }
         });
     }
+
+    @Test
+    public void launchChangePasswordUI_IdTokenNotRetrievedWithCD() throws Exception {
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(expectedIdToken);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangePasswordUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "The identity token was not retrieved using cloud directory idp.");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangePasswordUI_success() throws Exception {
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(mockIdToken);
+        JSONArray identitiesArray = new JSONArray();
+        JSONObject providerObject = new JSONObject();
+        providerObject.put("provider", "cloud_directory");
+        providerObject.put("id", "1234");
+        identitiesArray.put(providerObject);
+        when(mockIdToken.getIdentities()).thenReturn(identitiesArray);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangePasswordUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                String expectedAuthUrl = "https://appid-oauth.stubPrefix/oauth/v3/null/cloud_directory/change_password?user_id=1234";
+                assertEquals(exception.getMessage(), "Could NOT find installed browser that support Chrome tabs on the device.");
+                verify(spyAuthManager).createAuthorizationUIManager(any(OAuthManager.class), any(AuthorizationListener.class), eq(expectedAuthUrl), anyString());
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangePasswordUI_JSONException() throws Exception {
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(mockIdToken);
+        JSONArray identitiesArray = new JSONArray();
+        JSONObject providerObject = new JSONObject();
+        providerObject.put("provider", "cloud_directory");
+        identitiesArray.put(providerObject);
+        when(mockIdToken.getIdentities()).thenReturn(identitiesArray);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangePasswordUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "No value for id");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangeDetailsUI_noIdToken() throws Exception {
+
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangeDetailsUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "No identity token found.");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangeDetailsUI_IdTokenNotRetrievedWithCD() throws Exception {
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(expectedIdToken);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangeDetailsUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "The identity token was not retrieved using cloud directory idp.");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangeDetailsUI_success() throws Exception {
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(mockIdToken);
+        authManager.setAppIDRequestFactory(appIDRequestFactoryMock);
+        when(appIDRequestFactoryMock.createRequest(anyString(), anyString())).thenReturn(mockRequest);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         ResponseListener responseListener = (ResponseListener) args[0];
+                         responseListener.onSuccess(testGoodResponse);
+                         return null;
+                     }
+                 }
+        ).when(mockRequest).send(any(ResponseListener.class), any(AccessToken.class), any(IdentityToken.class));
+        JSONArray identitiesArray = new JSONArray();
+        JSONObject providerObject = new JSONObject();
+        providerObject.put("provider", "cloud_directory");
+        providerObject.put("id", "1234");
+        identitiesArray.put(providerObject);
+        when(mockIdToken.getIdentities()).thenReturn(identitiesArray);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangeDetailsUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                String expectedAuthUrl = "https://appid-oauth.stubPrefix/oauth/v3/null/cloud_directory/change_details?code=1234";
+                assertEquals(exception.getMessage(), "Could NOT find installed browser that support Chrome tabs on the device.");
+                verify(spyAuthManager).createAuthorizationUIManager(any(OAuthManager.class), any(AuthorizationListener.class), eq(expectedAuthUrl), anyString());
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangeDetailsUI_JSONException() throws Exception {
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(mockIdToken);
+        authManager.setAppIDRequestFactory(appIDRequestFactoryMock);
+        when(appIDRequestFactoryMock.createRequest(anyString(), anyString())).thenReturn(mockRequest);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         ResponseListener responseListener = (ResponseListener) args[0];
+                         responseListener.onSuccess(testGoodResponse);
+                         return null;
+                     }
+                 }
+        ).when(mockRequest).send(any(ResponseListener.class), any(AccessToken.class), any(IdentityToken.class));
+        JSONArray identitiesArray = new JSONArray();
+        JSONObject providerObject = new JSONObject();
+        identitiesArray.put(providerObject);
+        when(mockIdToken.getIdentities()).thenReturn(identitiesArray);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangeDetailsUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "No value for provider");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangeDetailsUI_failure_in_request_with_response() throws Exception {
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(mockIdToken);
+        authManager.setAppIDRequestFactory(appIDRequestFactoryMock);
+        when(appIDRequestFactoryMock.createRequest(anyString(), anyString())).thenReturn(mockRequest);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         ResponseListener responseListener = (ResponseListener) args[0];
+                         responseListener.onFailure(testResponse, null, null);
+                         return null;
+                     }
+                 }
+        ).when(mockRequest).send(any(ResponseListener.class), any(AccessToken.class), any(IdentityToken.class));
+        JSONArray identitiesArray = new JSONArray();
+        JSONObject providerObject = new JSONObject();
+        providerObject.put("provider", "cloud_directory");
+        providerObject.put("id", "1234");
+        identitiesArray.put(providerObject);
+        when(mockIdToken.getIdentities()).thenReturn(identitiesArray);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangeDetailsUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                String expectedError = "Code request failure ,response: " + testResponse.toString();
+                assertEquals(exception.getMessage(), expectedError);
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangeDetailsUI_failure_in_request_with_json() throws Exception {
+        final JSONObject expectedInfo = new JSONObject();
+        expectedInfo.put("error", "some error");
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(mockIdToken);
+        authManager.setAppIDRequestFactory(appIDRequestFactoryMock);
+        when(appIDRequestFactoryMock.createRequest(anyString(), anyString())).thenReturn(mockRequest);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         ResponseListener responseListener = (ResponseListener) args[0];
+                         responseListener.onFailure(null, null, expectedInfo);
+                         return null;
+                     }
+                 }
+        ).when(mockRequest).send(any(ResponseListener.class), any(AccessToken.class), any(IdentityToken.class));
+        JSONArray identitiesArray = new JSONArray();
+        JSONObject providerObject = new JSONObject();
+        providerObject.put("provider", "cloud_directory");
+        providerObject.put("id", "1234");
+        identitiesArray.put(providerObject);
+        when(mockIdToken.getIdentities()).thenReturn(identitiesArray);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangeDetailsUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                String expectedError = "Code request failure  ,extendedInfo: " + expectedInfo.toString();
+                assertEquals(exception.getMessage(), expectedError);
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchChangeDetailsUI_failure_in_request_with_exception() throws Exception {
+        final Throwable expectedException = new Throwable("some exception");
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        when(tokenManagerMock.getLatestIdentityToken()).thenReturn(mockIdToken);
+        authManager.setAppIDRequestFactory(appIDRequestFactoryMock);
+        when(appIDRequestFactoryMock.createRequest(anyString(), anyString())).thenReturn(mockRequest);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         ResponseListener responseListener = (ResponseListener) args[0];
+                         responseListener.onFailure(null, expectedException, null);
+                         return null;
+                     }
+                 }
+        ).when(mockRequest).send(any(ResponseListener.class), any(AccessToken.class), any(IdentityToken.class));
+        JSONArray identitiesArray = new JSONArray();
+        JSONObject providerObject = new JSONObject();
+        providerObject.put("provider", "cloud_directory");
+        providerObject.put("id", "1234");
+        identitiesArray.put(providerObject);
+        when(mockIdToken.getIdentities()).thenReturn(identitiesArray);
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchChangeDetailsUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                String expectedError = "Code request failure  ,exception: " + expectedException.getMessage();
+                assertEquals(exception.getMessage(), expectedError);
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchForgotPasswordUI_failure() throws Exception {
+
+        final AuthorizationManager spyAuthManager =  spy(authManager);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationSuccess();
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(mockActivity), any(RegistrationListener.class));
+
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        spyAuthManager.launchForgotPasswordUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                String expectedAuthUrl = "https://appid-oauth.stubPrefix/oauth/v3/null/cloud_directory/forgot_password";
+                assertEquals(exception.getMessage(), "Could NOT find installed browser that support Chrome tabs on the device.");
+                verify(spyAuthManager).createAuthorizationUIManager(any(OAuthManager.class), any(AuthorizationListener.class), eq(expectedAuthUrl), anyString());
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
 }
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl_Test.java
index 44a2021..756c544 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl_Test.java
@@ -129,4 +129,136 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
             }
         }, expectedAccessToken.getRaw());
     }
+
+    @Test
+    public void launchSignUp_test(){
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                AccessToken accessToken = expectedAccessToken;
+                AuthorizationListener authorizationListener = (AuthorizationListener) args[1];
+                authorizationListener.onAuthorizationSuccess(accessToken, null);
+                return null;
+            }
+        }).when(mockAuthManager).launchSignUpAuthorizationUI(any(Activity.class), any(AuthorizationListener.class));
+
+
+        loginWidget.launchSignUp(Mockito.mock(Activity.class), new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken, expectedAccessToken);
+            }
+        });
+    }
+
+    @Test
+    public void launchChangePassword_test(){
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                AccessToken accessToken = expectedAccessToken;
+                AuthorizationListener authorizationListener = (AuthorizationListener) args[1];
+                authorizationListener.onAuthorizationSuccess(accessToken, null);
+                return null;
+            }
+        }).when(mockAuthManager).launchChangePasswordUI(any(Activity.class), any(AuthorizationListener.class));
+
+
+        loginWidget.launchChangePassword(Mockito.mock(Activity.class), new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken, expectedAccessToken);
+            }
+        });
+    }
+
+    @Test
+    public void launchChangeDetails_test(){
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                AccessToken accessToken = expectedAccessToken;
+                AuthorizationListener authorizationListener = (AuthorizationListener) args[1];
+                authorizationListener.onAuthorizationSuccess(accessToken, null);
+                return null;
+            }
+        }).when(mockAuthManager).launchChangeDetailsUI(any(Activity.class), any(AuthorizationListener.class));
+
+
+        loginWidget.launchChangeDetails(Mockito.mock(Activity.class), new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken, expectedAccessToken);
+            }
+        });
+    }
+
+    @Test
+    public void launchForgotPassword_test(){
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                AuthorizationListener forgotPasswordListener = (AuthorizationListener) args[1];
+                forgotPasswordListener.onAuthorizationSuccess(null, null);
+                return null;
+            }
+        }).when(mockAuthManager).launchForgotPasswordUI(any(Activity.class), any(AuthorizationListener.class));
+
+
+        loginWidget.launchForgotPassword(Mockito.mock(Activity.class), new AuthorizationListener() {
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assert(true);
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationCanceled");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+        });
+    }
 }
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest_Test.java
index e2fe9ee..22b6cfb 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest_Test.java
@@ -27,6 +27,8 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
+
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -77,6 +79,11 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
 
 
         final Response testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -87,11 +94,26 @@ public String getResponseText() {
                 return null;
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
index f664a44..cc772f9 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
@@ -29,6 +29,7 @@
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
 
+import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -42,6 +43,7 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.robolectric.RobolectricTestRunner;
 
+import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.Signature;
 import java.security.interfaces.RSAPrivateKey;
@@ -128,6 +130,11 @@ public BigInteger getModulus() {
     public void obtainTokensRop_success() {
 
         testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -139,11 +146,26 @@ public String getResponseText() {
                         "\"id_token\":" + expectedIdToken.getRaw() + "}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -160,7 +182,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
             }
         }).when(stubRequest).send(any(Map.class), any(ResponseListener.class));
 
-        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+        spyTokenManager.obtainTokens(username, password, Consts.ACCESS_TOKEN, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
                 fail("should get to onAuthorizationSuccess");
@@ -179,6 +201,11 @@ public void obtainTokensRop_failure() {
 
         final String testDescription = "test description error123";
         testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 400;
@@ -189,11 +216,26 @@ public String getResponseText() {
                 return "{\"error\": \"invalid_grant\" , \"error_description\": \"" + testDescription + "\" }";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -210,10 +252,10 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
             }
         }).when(stubRequest).send(any(Map.class), any(ResponseListener.class));
 
-        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+        spyTokenManager.obtainTokens(username, password, null, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
-                assertEquals(exception.getMessage(), "Failed to retrieve tokens: " + testDescription);
+                assertEquals(exception.getMessage(),  testDescription);
             }
 
             @Override
@@ -224,7 +266,7 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
         });
         //test the exception parsing
         testReponse = null;
-        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+        spyTokenManager.obtainTokens(username, password, null, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
                 assertEquals(exception.getMessage(), "Failed to retrieve tokens" );
@@ -252,7 +294,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
             }
         }).when(stubRequest).send(any(Map.class), any(ResponseListener.class));
 
-        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+        spyTokenManager.obtainTokens(username, password, null, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
                 assertEquals(exception.getMessage(), "Failed to parse server response");
@@ -266,6 +308,11 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
         });
         //bad access token
         testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -277,17 +324,32 @@ public String getResponseText() {
                         "\"id_token\":" + expectedIdToken.getRaw() + "}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
             }
         };
-        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+        spyTokenManager.obtainTokens(username, password, null, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
                 assertEquals(exception.getMessage(), "Failed to parse access_token");
@@ -301,6 +363,11 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
         });
         //bad id token
         testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -312,18 +379,33 @@ public String getResponseText() {
                         "\"id_token\":" + "\"bad Id token\"" + "}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
             }
         };
 
-        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+        spyTokenManager.obtainTokens(username, password, null, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
                 assertEquals(exception.getMessage(), "Failed to parse id_token");
@@ -343,6 +425,11 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
     public void obtainTokens_Authorization_Code_success() {
 
         testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -354,11 +441,26 @@ public String getResponseText() {
                         "\"id_token\":" + expectedIdToken.getRaw() + "}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -398,6 +500,11 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
     public void obtainTokens_Authorization_Code_failure() {
 
         testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -409,11 +516,26 @@ public String getResponseText() {
                         "\"id_token\":" + expectedIdToken.getRaw() + "}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl_Test.java
index ecaf5ef..2feb12f 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl_Test.java
@@ -25,7 +25,7 @@
 import com.ibm.bluemix.appid.android.testing.helpers.Consts;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
-import com.squareup.okhttp.RequestBody;
+import okhttp3.RequestBody;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -41,6 +41,7 @@
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -88,6 +89,11 @@ public void before(){
     public void getAllAttributes_happy_flow() {
 
         final Response testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -98,11 +104,26 @@ public String getResponseText() {
                 return "{\"age\": 30, \"email\":\"test@ibm.com\"}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -143,6 +164,11 @@ public void onFailure(UserAttributesException e) {
     public void getAllAttributes_happy_flow_null_response_text() {
 
         final Response testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -153,11 +179,26 @@ public String getResponseText() {
                 return null;
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -192,6 +233,11 @@ public void onFailure(UserAttributesException e) {
     public void getAllAttributes_happy_flow_empty_response_text() {
 
         final Response testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -202,11 +248,26 @@ public String getResponseText() {
                 return "";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -241,6 +302,11 @@ public void onFailure(UserAttributesException e) {
     public void getAllAttributes_request_failure_json_format() {
 
         final Response testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -251,11 +317,26 @@ public String getResponseText() {
                 return "56";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -316,6 +397,11 @@ public void onFailure(UserAttributesException e) {
     @Test
     public void getAllAttributes_request_failure_401() {
         final Response testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 401;
@@ -326,11 +412,26 @@ public String getResponseText() {
                 return null;
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -363,6 +464,11 @@ public void onFailure(UserAttributesException e) {
     @Test
     public void getAllAttributes_request_failure_404() {
         final Response testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 404;
@@ -373,11 +479,26 @@ public String getResponseText() {
                 return null;
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -411,6 +532,11 @@ public void onFailure(UserAttributesException e) {
     public void getAllAttributes_happy_flow_no_token_supply() {
 
         final Response testReponse = new Response() {
+            @Override
+            public String getRequestURL() {
+                return null;
+            }
+
             @Override
             public int getStatus() {
                 return 200;
@@ -421,11 +547,26 @@ public String getResponseText() {
                 return "{\"age\": 30, \"email\":\"test@ibm.com\"}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -465,17 +606,12 @@ public void onFailure(UserAttributesException e) {
     @Test
     public void setAttribute_no_token_supply() {
 
-        doAnswer(new Answer() {
+        final Response testReponse = new Response() {
             @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                ResponseListener responseListener = (ResponseListener) args[0];
-                responseListener.onFailure(null, null, null);
+            public String getRequestURL() {
                 return null;
             }
-        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
 
-        final Response testReponse = new Response() {
             @Override
             public int getStatus() {
                 return 200;
@@ -486,11 +622,26 @@ public String getResponseText() {
                 return "{\"name\": \"testName\", \"value\":\"testValue\"}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -539,17 +690,12 @@ public void onFailure(UserAttributesException e) {
     @Test
     public void getAttribute_no_token_supply() {
 
-        doAnswer(new Answer() {
+        final Response testReponse = new Response() {
             @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                ResponseListener responseListener = (ResponseListener) args[0];
-                responseListener.onFailure(null, null, null);
+            public String getRequestURL() {
                 return null;
             }
-        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
 
-        final Response testReponse = new Response() {
             @Override
             public int getStatus() {
                 return 200;
@@ -560,11 +706,26 @@ public String getResponseText() {
                 return "{\"name\": \"testName\", \"value\":\"testValue\"}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;
@@ -612,17 +773,12 @@ public void onFailure(UserAttributesException e) {
     @Test
     public void deleteAttribute_no_token_supply() {
 
-        doAnswer(new Answer() {
+        final Response testReponse = new Response() {
             @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                ResponseListener responseListener = (ResponseListener) args[0];
-                responseListener.onFailure(null, null, null);
+            public String getRequestURL() {
                 return null;
             }
-        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
 
-        final Response testReponse = new Response() {
             @Override
             public int getStatus() {
                 return 200;
@@ -633,11 +789,26 @@ public String getResponseText() {
                 return "{\"name\": \"testName\", \"value\":\"testValue\"}";
             }
 
+            @Override
+            public JSONObject getResponseJSON() {
+                return null;
+            }
+
             @Override
             public byte[] getResponseBytes() {
                 return new byte[0];
             }
 
+            @Override
+            public InputStream getResponseByteStream() {
+                return null;
+            }
+
+            @Override
+            public long getContentLength() {
+                return 0;
+            }
+
             @Override
             public Map<String, List<String>> getHeaders() {
                 return null;