diff --git a/test/diameter_nasreq_SUITE.erl b/test/diameter_nasreq_SUITE.erl
index d9970e8..1790d95 100644
--- a/test/diameter_nasreq_SUITE.erl
+++ b/test/diameter_nasreq_SUITE.erl
@@ -409,7 +409,7 @@ simple(Config, TermOpts) ->
 
 simple_tdf_userid(Config, TermOpts) ->
     Stats0 = get_stats(?SERVICE),
-    Msisdn = ?MSISDN_FOR_IMEI_SV, % <<"543148000012345">>,
+    Msisdn = ?MSISDN_FOR_IMEI_SV,
     Imsi = <<"250071234567890">>,
     Imei = <<82,21,50,96,32,80,30,0>>,
     {ok, Session} = ergw_aaa_session_sup:new_session(
diff --git a/test/diameter_test_server.erl b/test/diameter_test_server.erl
index 4b2ad01..1d9bf55 100644
--- a/test/diameter_test_server.erl
+++ b/test/diameter_test_server.erl
@@ -281,32 +281,29 @@ handle_request(#diameter_packet{msg = ['AAR' | Msg]}, _SvcName, {_, Caps}, _Extr
 		   [<<0,0,0,0>>] -> [<<10,106,14,227>>];
 		   FramedIPReq -> FramedIPReq
 	       end,
-    OkResponse = fun() ->
-	AAA0 =  #{'Session-Id' => Id,
-	          'Result-Code' => 2001,
-	          'Origin-Host' => OH,
-	          'Origin-Realm' => OR,
-  	          'SN-Primary-DNS-Server' => [{1,2,3,4}],
-	          'SN-Secondary-DNS-Server' => [{5,6,7,8}],
- 	          'Acct-Interim-Interval' => [InterimAccounting],
-	          'Authorization-Lifetime' => [AuthLifeTime],
-	          'Framed-IP-Address' => FramedIP,
-	          'Framed-MTU' => 1500,
-	          'Auth-Request-Type' => Type,
-	          'Auth-Application-Id' => AppId},
-	AAA = if is_map_key('Framed-IPv6-Prefix', Msg) ->
-	    AAA0#{'3GPP-IPv6-DNS-Servers' =>
-		    ergw_aaa_3gpp_dict:encode('3GPP-IPv6-DNS-Servers',
-					      [{16#fe80,0,0,0,0,0,0,1},
-					       {16#fe80,0,0,0,0,0,0,2}])};
-		    true -> AAA0
-	end,
-	{reply, ['AAA' | AAA]}
+    AAA0 =  #{'Session-Id' => Id,
+              'Result-Code' => 2001,
+              'Origin-Host' => OH,
+              'Origin-Realm' => OR,
+              'SN-Primary-DNS-Server' => [{1,2,3,4}],
+              'SN-Secondary-DNS-Server' => [{5,6,7,8}],
+              'Acct-Interim-Interval' => [InterimAccounting],
+              'Authorization-Lifetime' => [AuthLifeTime],
+              'Framed-IP-Address' => FramedIP,
+              'Framed-MTU' => 1500,
+              'Auth-Request-Type' => Type,
+              'Auth-Application-Id' => AppId},
+    AAA = if is_map_key('Framed-IPv6-Prefix', Msg) ->
+        AAA0#{'3GPP-IPv6-DNS-Servers' =>
+    	    ergw_aaa_3gpp_dict:encode('3GPP-IPv6-DNS-Servers',
+    				      [{16#fe80,0,0,0,0,0,0,1},
+    				       {16#fe80,0,0,0,0,0,0,2}])};
+    	    true -> AAA0
     end,
     case Msg of
-	#{'Calling-Station-Id' := ?MSISDN_FOR_IMEI_SV, '3GPP-IMEISV' := _} -> OkResponse();
+	#{'Calling-Station-Id' := ?MSISDN_FOR_IMEI_SV, '3GPP-IMEISV' := _} -> {reply, ['AAA' | AAA]};
 	#{'Calling-Station-Id' := ?MSISDN_FOR_IMEI_SV} -> {answer_message, 5005};
-	_ -> OkResponse()
+	_ -> {reply, ['AAA' | AAA]}
     end;
 
 handle_request(#diameter_packet{msg = ['STR' | Msg]}, _SvcName, {_, Caps}, _Extra)
diff --git a/test/ergw_aaa_test_lib.hrl b/test/ergw_aaa_test_lib.hrl
index 5d85b73..13d9a68 100644
--- a/test/ergw_aaa_test_lib.hrl
+++ b/test/ergw_aaa_test_lib.hrl
@@ -31,4 +31,4 @@
 			    reset_session_stats/0]).
 -endif.
 
--define(MSISDN_FOR_IMEI_SV, "AAAAAAAAAAAAAAA").
\ No newline at end of file
+-define(MSISDN_FOR_IMEI_SV, "AAAAAAAAAAAAAAA").