diff --git a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
index 96af26e..3577c13 100644
--- a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
+++ b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
@@ -80,6 +80,7 @@
 				if(csv!=null) {
 					try {
 						mbc = new MapBathConverter(access, new CSV(csv));
+						access.printf(Level.INIT, "MapBathConversion enabled with file %s\n",csv);
 					} catch (IOException e) {
 						access.log(e);
 					}
diff --git a/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java b/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java
index f915538..386f529 100644
--- a/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java
+++ b/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java
@@ -27,7 +27,9 @@
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.Permission;
 import org.apache.shiro.subject.PrincipalCollection;
+import org.junit.Test;
 import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.shiro.AAFRealm;
 import org.onap.aaf.cadi.shiro.AAFShiroPermission;
 
@@ -45,7 +47,8 @@
  		TestAAFRealm ar = new TestAAFRealm();
 		
  		//UsernamePasswordToken upt = new UsernamePasswordToken("demo@people.osaaf.org", "demo123456!");
- 		UsernamePasswordToken upt = new UsernamePasswordToken("AAI", "AAI");
+ 		/// UsernamePasswordToken upt = new UsernamePasswordToken("AAI", "AAI");
+ 		UsernamePasswordToken upt = new UsernamePasswordToken("admin","Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U");
  		
  		AuthenticationInfo ani = ar.authn(upt);
 		
@@ -62,7 +65,6 @@
  	}
  }
 */
-
 	private void testAPerm(boolean expect, AuthorizationInfo azi, String ns, String type, String instance, String action) {
 		
 		AAFShiroPermission testPerm = new AAFShiroPermission(new AAFPermission(ns,type,instance,action,new ArrayList<String>()));
