diff --git a/application/helpers/viewHelper.php b/application/helpers/viewHelper.php
index 76364f3a372..0a93dd5c3ff 100644
--- a/application/helpers/viewHelper.php
+++ b/application/helpers/viewHelper.php
@@ -314,6 +314,6 @@ public static function getLanguageData($bOrderByNative=false,$sLanguageCode='en'
      * @return string
      */
      public static function getViewTestTag($name){
-         return CHtml::tag('div',['id'=>'action::'.$name,'style'=>'']);
+         return '<x-test id="action::'.$name.'" />';
      }
 }
diff --git a/application/views/admin/survey/editLocalSettings_view.php b/application/views/admin/survey/editLocalSettings_view.php
index 1f33be19f8d..cef1bf9648e 100644
--- a/application/views/admin/survey/editLocalSettings_view.php
+++ b/application/views/admin/survey/editLocalSettings_view.php
@@ -36,7 +36,7 @@
                     </div>
                 </div>
             </div>
-            <hr class="col-sm-12"></hr>
+            <hr class="col-sm-12" />
         </div>
         <div class="row">
             <div class="col-sm-12 col-md-6">
diff --git a/application/views/admin/survey/subview/_create_survey_text.php b/application/views/admin/survey/subview/_create_survey_text.php
index 22d6b4ca277..74569a48971 100644
--- a/application/views/admin/survey/subview/_create_survey_text.php
+++ b/application/views/admin/survey/subview/_create_survey_text.php
@@ -57,7 +57,7 @@
                 </div>
             </div>
         </div>
-        <hr class="col-sm-12"></hr>
+        <hr class="col-sm-12" />
     </div>
     <div class="row">
         <div class="col-sm-12 col-md-6">
diff --git a/application/views/admin/survey/subview/accordion/_notification_panel.php b/application/views/admin/survey/subview/accordion/_notification_panel.php
index 82386f52526..0cf687495c1 100755
--- a/application/views/admin/survey/subview/accordion/_notification_panel.php
+++ b/application/views/admin/survey/subview/accordion/_notification_panel.php
@@ -44,12 +44,13 @@
                             'offLabel'=>gT('Off'),
                             'events'=>array('switchChange.bootstrapSwitch'=>"function(event,state){
                                 if ($('#anonymized').is(':checked') == true) {
-                                $('#datestampModal').modal();
+                                $('#datestampModal_1').modal();
                                 }
                             }")
                             ));
                             $this->widget('bootstrap.widgets.TbModal', array(
-                                'id' => 'datestampModal',
+                                'id' => 'datestampModal_1',
+                                'htmlOptions' => ['class' => 'selector_dateStampModal_notification'],
                                 'header' => gt('Warning','unescaped'),
                                 'content' => '<p>'.gT("If the option -Anonymized responses- is activated only a dummy date stamp (1980-01-01) will be used for all responses to ensure the anonymity of your participants.").'</p>',
                                 'footer' => TbHtml::button('Close', array('data-dismiss' => 'modal'))
@@ -75,10 +76,15 @@
                             'name' => 'ipaddr',
                             'value'=> $oSurvey->isIpAddr,
                             'onLabel'=>gT('On'),
-                            'offLabel'=>gT('Off')
+                            'offLabel'=>gT('Off'),
+                            'events'=>array('switchChange.bootstrapSwitch'=>"function(event,state){
+                                if ($('#anonymized').is(':checked') == true) {
+                                $('#datestampModal_2').modal();
+                                }
+                            }")
                         ));
                         $this->widget('bootstrap.widgets.TbModal', array(
-                            'id' => 'datestampModal',
+                            'id' => 'datestampModal_2',
                             'header' => gt('Warning','unescaped'),
                             'content' => '<p>'.gT("If the option -Anonymized responses- is activated only a dummy date stamp (1980-01-01) will be used for all responses to ensure the anonymity of your participants. If you are running a closed survey you will NOT be able to link responses to participants if the survey is set to be anonymous.").'</p>',
                             'footer' => TbHtml::button('Close', array('data-dismiss' => 'modal'))
diff --git a/application/views/admin/survey/subview/accordion/_presentation_panel.php b/application/views/admin/survey/subview/accordion/_presentation_panel.php
index 3ce50bb97ef..b2f515bfbbd 100644
--- a/application/views/admin/survey/subview/accordion/_presentation_panel.php
+++ b/application/views/admin/survey/subview/accordion/_presentation_panel.php
@@ -20,7 +20,7 @@
     var sAddParam = '';
 </script>
 <!-- Presentation panel -->
-<div id='presentation' class="container-fluid">
+<div id='presentation-panel' class="container-fluid">
     <div class="col-sm-12 col-md-6">
         <!-- Navigation delay -->
         <div class="form-group">
diff --git a/application/views/admin/survey/subview/accordion/_publication_panel.php b/application/views/admin/survey/subview/accordion/_publication_panel.php
index d0a3a93b198..b511fab845e 100755
--- a/application/views/admin/survey/subview/accordion/_publication_panel.php
+++ b/application/views/admin/survey/subview/accordion/_publication_panel.php
@@ -19,7 +19,7 @@
     var sAddParam = '';
 </script>
 <!-- Publication panel -->
-<div id='publication' class="container-fluid">
+<div id='publication-panel' class="container-fluid">
     <div class="row">
         <div class="col-sm-12 col-md-6">
 
diff --git a/application/views/admin/survey/subview/accordion/_tokens_panel.php b/application/views/admin/survey/subview/accordion/_tokens_panel.php
index 445f65852e6..e4ed21afda9 100755
--- a/application/views/admin/survey/subview/accordion/_tokens_panel.php
+++ b/application/views/admin/survey/subview/accordion/_tokens_panel.php
@@ -20,7 +20,7 @@
     var sAddParam = '';
 </script>
 <!-- tokens panel -->
-<div id='tokens' class="container-fluid">
+<div id='tokens-panel' class="container-fluid">
     <div class="row">
         <div class="col-sm-12 col-md-6">
             <!--  Set token length to -->
@@ -188,4 +188,4 @@ function alertPrivacy()
         'content' => '<p>'.gT("If the option -Anonymized responses- is activated only a dummy date stamp (1980-01-01) will be used for all responses to ensure the anonymity of your participants.").'</p>',
         'footer' => TbHtml::button('Close', array('data-dismiss' => 'modal'))
     ));
-    ?>
\ No newline at end of file
+    ?>