diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot
index 4909821..aa6fc05 100644
--- a/tests/dcaegen2/prh-testcases/prh_tests.robot
+++ b/tests/dcaegen2/prh-testcases/prh_tests.robot
@@ -59,7 +59,7 @@
     [Tags]    PRH
     ${data}=    Get Data From File    ${Not_json_format}
     Set event in DMaaP    ${data}
-    #TODO to fix after CBS merge
+    #TODO hangs up build
     #Wait Until Keyword Succeeds    100x    300ms    Check PRH log    |java.lang.IllegalStateException: Not a JSON Array:
 
 Get valid event from DMaaP and AAI is not responding
@@ -69,6 +69,5 @@
     ${data}=    Get Data From File    ${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}
     Ensure Container Is Exited   aai_simulator
     Set event in DMaaP    ${data}
-    #TODO fix after CBS merge
-    #Wait Until Keyword Succeeds    100x    300ms    Check PRH log    java.net.UnknownHostException: aai
+    Wait Until Keyword Succeeds    100x    300ms    Check PRH log    java.net.UnknownHostException: aai
     Ensure Container Is Running  aai_simulator