diff --git a/t/selenium/controller_profileset.t b/t/selenium/controller_profileset.t
index 384b1f3665..2edb4e6022 100644
--- a/t/selenium/controller_profileset.t
+++ b/t/selenium/controller_profileset.t
@@ -128,6 +128,8 @@ $d->move_and_click('//*[@id="subscriber_profile_table"]//tr[1]/td//a[contains(te
 diag('Add NCOS to Profile');
 $d->find_element('//*[@id="preference_groups"]//div//a[contains(text(), "Call Blockings")]')->click();
 $d->move_and_click('//table//tr//td[contains(text(), "ncos")]//..//td//a[contains(text(), "Edit")]', 'xpath', '//*[@id="preference_groups"]//div//a[contains(text(), "Call Blockings")]');
+ok($d->find_element_by_xpath('//*[@id="mod_edit"]/div/h3[contains(text(), "' . "Edit Preference 'NCOS Level'" . '")]'), "Edit Window has been opened");
+$d->find_element('//*[@id="ncos"]')->click();
 $d->find_element('//*[@id="ncos"]//option[contains(text(), "'. $ncosname .'")]')->click();
 $d->find_element('//*[@id="save"]')->click();
 
@@ -217,8 +219,6 @@ $d->fill_element('//*[@id="subscriber_profile_sets_table_filter"]/label/input',
 ok($d->find_element_by_css('#subscriber_profile_sets_table tr > td.dataTables_empty'), 'Cloned Profile set was deleted');
 
 diag('Trying to NOT Delete Subscriber Profile Set');
-$d->fill_element('//*[@id="subscriber_profile_sets_table_filter"]/label/input', 'xpath', 'thisshouldnotexist');
-ok($d->find_element_by_css('#subscriber_profile_sets_table tr > td.dataTables_empty'), 'Table is empty');
 $d->fill_element('//*[@id="subscriber_profile_sets_table_filter"]/label/input', 'xpath', $setname);
 ok($d->wait_for_text('//*[@id="subscriber_profile_sets_table"]/tbody/tr/td[3]', $setname), 'Profile Set was found');
 $d->move_and_click('//*[@id="subscriber_profile_sets_table"]/tbody/tr[1]/td/div/a[contains(text(), "Delete")]', 'xpath', '//*[@id="subscriber_profile_sets_table_filter"]/label/input');
diff --git a/t/selenium/runner.t b/t/selenium/runner.t
index 5652465a6e..407f4f3bb0 100644
--- a/t/selenium/runner.t
+++ b/t/selenium/runner.t
@@ -105,11 +105,11 @@ if($testplan eq $dir . 'runner.t') {
         push @tests, $string;
     };
     if (index($testplan, $dir . 'controller_profilepackage.t') != -1) {
-        $string = $dir . 'controller_profile.t';
+        $string = $dir . 'controller_profilepackage.t';
         push @tests, $string;
     };
     if (index($testplan, $dir . 'controller_profileset.t') != -1) {
-        $string = $dir . 'controller_subprofile.t';
+        $string = $dir . 'controller_profileset.t';
         push @tests, $string;
     };
     if (index($testplan, $dir . 'controller_reseller.t') != -1) {