diff --git a/tests/Harmattan/TestScripts/tc_theming.rb b/tests/Harmattan/TestScripts/tc_theming.rb
index c38d211..afa609a 100755
--- a/tests/Harmattan/TestScripts/tc_theming.rb
+++ b/tests/Harmattan/TestScripts/tc_theming.rb
@@ -176,7 +176,7 @@ class TC_Theming < Test::Unit::TestCase
                     "/tmp/testshot3.png", "/tmp/testshot4.png")
     end
     
-    def test_booster_killer
+    def test_theme_change_booster_restart 
         m_pid = `pgrep -n booster-m`
         w_pid = `pgrep -n booster-w`
         print "Current booster-m %s" % m_pid
diff --git a/tests/Harmattan/TestScripts/test-func-launcher.py b/tests/Harmattan/TestScripts/test-func-launcher.py
index 88dc4bc..b226bf9 100644
--- a/tests/Harmattan/TestScripts/test-func-launcher.py
+++ b/tests/Harmattan/TestScripts/test-func-launcher.py
@@ -313,21 +313,6 @@ class launcher_tests (unittest.TestCase):
 
         self.assert_(success, "invoker terminated before delay elapsed")
 
-    def test_013_applauncherd_usage(self):
-        """
-        Test applauncherd.bin help
-        """
-        st, op = commands.getstatusoutput("applauncherd.bin --help")
-        self.assert_(st == 0, "Usage not printed")
-        str = op.split('\n')
-        self.assert_(str[0] == 'Usage: applauncherd [options]', "usage not printed properly")
-
-        # exec invoker --creds (for coverage)
-        run_app_as_user("invoker --creds")
-
-        # exec invoker --help (for coverage)
-        run_app_as_user("invoker --help")
-
 
     def test_014_fd_booster_m(self):
         """
diff --git a/tests/Harmattan/art-tests/tests.xml b/tests/Harmattan/art-tests/tests.xml
index 204fd44..6735ddd 100644
--- a/tests/Harmattan/art-tests/tests.xml
+++ b/tests/Harmattan/art-tests/tests.xml
@@ -10,20 +10,20 @@
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
 
-      <case name="zombie-state" type="Functional" description="To test that process exits after the application is killed" timeout="120" level="System">
+      <case name="zombie-state" type="Functional" description="To test that process exits after the application is killed" timeout="360" level="System">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_003_zombie_state</step>
       </case>
 
-      <case name="launch-multi-app" type="Functional" description="To test that more than one applications are launched by the launcher" timeout="120" level="System">
+      <case name="launch-multi-app" type="Functional" description="To test that more than one applications are launched by the launcher" timeout="360" level="System">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_004_launch_multiple_apps</step>
       </case>
 
-      <case name="one-instance" type="Functional" description="To test that only one instance of a application exist" timeout="120" level="System">
+      <case name="one-instance" type="Functional" description="To test that only one instance of a application exist" timeout="360" level="System">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_005_one_instance</step>
       </case>
       
       <!-- Enable this test for art once the credientials are stable-->
-      <!--case name="creds-test" type="Functional" description="Test that launched applications get correct credentials when they provide Aegis files" timeout="120" level="System">
+      <!--case name="creds-test" type="Functional" description="Test that launched applications get correct credentials when they provide Aegis files" timeout="360" level="System">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_006_creds</step>
       </case-->
 
@@ -40,7 +40,7 @@
       <pre_steps>
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
-      <case name="Prestart-launched" type="Functional" description="To test that prestarted application is launched" timeout="120" level="System">
+      <case name="Prestart-launched" type="Functional" description="To test that prestarted application is launched" timeout="360" level="System">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/ts_prestartapp.rb name test_launch_prestarted_app</step>
       </case>
 
diff --git a/tests/Harmattan/bug-tests/tests.xml b/tests/Harmattan/bug-tests/tests.xml
index 6df9fb3..7985cb3 100644
--- a/tests/Harmattan/bug-tests/tests.xml
+++ b/tests/Harmattan/bug-tests/tests.xml
@@ -57,8 +57,8 @@
         <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/tc_theming.rb --name test_global_theming</step>
       </case>
 
-      <case name="booster-killer" type="Functional" description="Tests that booster-m and booster-w are restarted after theme change" timeout="360" level="System" insignificant="true">
-        <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/tc_theming.rb --name test_booster_killer</step>
+      <case name="theme-change-booster-restart" type="Functional" description="Tests that booster-m and booster-w are restarted after theme change" timeout="360" level="System" insignificant="true">
+        <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/tc_theming.rb --name test_theme_change_booster_restart</step>
       </case>
       <environments>
           <scratchbox>true</scratchbox>
diff --git a/tests/Harmattan/functests/tests.xml b/tests/Harmattan/functests/tests.xml
index b0274f5..b9405e9 100644
--- a/tests/Harmattan/functests/tests.xml
+++ b/tests/Harmattan/functests/tests.xml
@@ -39,10 +39,6 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_012</step>
       </case>
 
-      <case name="applauncherd-usage" type="Functional" description="Test that invokers --delay parameter works" timeout="360" level="System" insignificant="true">
-          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_013_applauncherd_usage</step>
-      </case>
-
       <case name="invoker_search_prog" type="Functional" description="Test that invoker finds binaries from PATH" timeout="360" level="System" insignificant="true">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_search_prog</step>
       </case>
diff --git a/tests/Harmattan/perftests/tests.xml b/tests/Harmattan/perftests/tests.xml
index 3ddcad7..703214c 100644
--- a/tests/Harmattan/perftests/tests.xml
+++ b/tests/Harmattan/perftests/tests.xml
@@ -10,7 +10,7 @@
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
 
-      <case name="launcher1" type="Performance" description="Measure launcher performance" timeout="240" level="System">
+      <case name="launcher1" type="Performance" description="Measure launcher performance" timeout="840" level="System">
 	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-perf-mbooster.py test_001 &gt; /tmp/launcher_perf.txt</step>
       </case>
 
@@ -29,11 +29,11 @@
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
 
-      <case name="Perf-Test-Grid-launcher" type="Performance" description="Measure startup time of the application using launcher" timeout="360" level="System" insignificant="true">
+      <case name="Perf-Test-Grid-launcher" type="Performance" description="Measure startup time of the application using launcher" timeout="860" level="System" insignificant="true">
 	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -a fala_wl &gt; /tmp/perf_grid_with_launcher.txt</step>
       </case>
 
-      <case name="Perf-Test-Grid-plain" type="Performance" description="Measure startup time of the application without launcher" timeout="360" level="System" insignificant="true">
+      <case name="Perf-Test-Grid-plain" type="Performance" description="Measure startup time of the application without launcher" timeout="860" level="System" insignificant="true">
 	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -a fala_wol &gt; /tmp/perf_grid_without_launcher.txt</step>
       </case>
 
@@ -54,10 +54,10 @@
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
 
-      <case name="Perf-Test-Command-launcher" type="Performance" description="Measure startup time of the application using launcher" timeout="360" level="System" insignificant="true">
+      <case name="Perf-Test-Command-launcher" type="Performance" description="Measure startup time of the application using launcher" timeout="860" level="System" insignificant="true">
 	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -c /usr/bin/fala_wl &gt; /tmp/perf_commandline_with_launcher.txt</step>
       </case>
-      <case name="Perf-Test-Command-plain" type="Performance" description="Measure startup time of the application using launcher" timeout="360" level="System" insignificant="true">
+      <case name="Perf-Test-Command-plain" type="Performance" description="Measure startup time of the application using launcher" timeout="860" level="System" insignificant="true">
 	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -c /usr/bin/fala_wol &gt; /tmp/perf_commandline_without_launcher.txt</step>
       </case>
       <environments>