diff --git a/.circleci/config.yml b/.circleci/config.yml
index 48b83f1..14bbfaf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -182,7 +182,7 @@ jobs:
       - run:
           name: run functional tests
           command: |
-            export FUNCTIONAL_PRESETS='not mujoco and not CARLA and not doom'
+            export FUNCTIONAL_PRESETS="'not mujoco and not CARLA and not doom'"
             python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn functional-test -tc "export FUNCTIONAL_PRESETS=${FUNCTIONAL_PRESETS} && make functional_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
           no_output_timeout: 30m
       - run:
@@ -202,7 +202,7 @@ jobs:
       - run:
           name: run gym related golden tests
           command: |
-            export GOLDEN_PRESETS='CartPole'
+            export GOLDEN_PRESETS="'CartPole or BitFlip'"
             python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn golden-test-gym -tc "export GOLDEN_PRESETS=${GOLDEN_PRESETS} && make golden_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-gym_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
           no_output_timeout: 30m
       - run:
@@ -222,7 +222,7 @@ jobs:
       - run:
           name: run doom related golden tests
           command: |
-            export GOLDEN_PRESETS='Doom'
+            export GOLDEN_PRESETS="Doom"
             python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn golden-test-doom -tc "export GOLDEN_PRESETS=${GOLDEN_PRESETS} && make golden_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-doom_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
           no_output_timeout: 30m
       - run:
@@ -242,9 +242,9 @@ jobs:
       - run:
           name: run mujoco related golden tests
           command: |
-            export GOLDEN_PRESETS='BitFlip or Mujoco'
+            export GOLDEN_PRESETS="Mujoco"
             python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn golden-test-mujoco -tc "export GOLDEN_PRESETS=${GOLDEN_PRESETS} && make golden_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-mujoco_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
-          no_output_timeout: 30m
+          no_output_timeout: 45m
       - run:
           name: cleanup
           command: |
@@ -262,7 +262,7 @@ jobs:
       - run:
           name: run starcraft related golden tests
           command: |
-            export GOLDEN_PRESETS='Starcraft'
+            export GOLDEN_PRESETS="Starcraft"
             python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn golden-test-starcraft -tc "export GOLDEN_PRESETS=${GOLDEN_PRESETS} && make golden_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-starcraft_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
           no_output_timeout: 30m
       - run:
@@ -282,9 +282,9 @@ jobs:
       - run:
           name: run mujoco related functional tests
           command: |
-            export FUNCTIONAL_PRESETS='Mujoco'
+            export FUNCTIONAL_PRESETS="Mujoco"
             python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn functional-test-mujoco -tc "export FUNCTIONAL_PRESETS=${FUNCTIONAL_PRESETS} && make functional_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-mujoco_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
-          no_output_timeout: 30m
+          no_output_timeout: 45m
       - run:
           name: cleanup
           command: |
@@ -302,7 +302,7 @@ jobs:
       - run:
           name: run doom related functional tests
           command: |
-            export FUNCTIONAL_PRESETS='Doom'
+            export FUNCTIONAL_PRESETS="Doom"
             python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn functional-test-doom -tc "export FUNCTIONAL_PRESETS=${FUNCTIONAL_PRESETS} && make functional_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-doom_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
           no_output_timeout: 30m
       - run:
@@ -322,8 +322,8 @@ jobs:
       - run:
           name: run Starcraft related functional tests
           command: |
-            export FUNCTIONAL_PRESETS='Starcraft'
-            python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn functional-test-starcraft -tc "export FUNCTIONAL_PRESETS=${FUNCTIONAL_PRESETS} && make functional_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-starcraft_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
+            export FUNCTIONAL_PRESETS="Starcraft"
+            python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn functional-test-starcraft -tc "export FUNCTIONAL_PRESETS='${FUNCTIONAL_PRESETS}' && make functional_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-starcraft_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
           no_output_timeout: 30m
       - run:
           name: cleanup
@@ -384,7 +384,7 @@ jobs:
           command: |
             export TRACE_PRESETS='BitFlip_DQN_HER,BitFlip_DQN,Mujoco_A3C,Mujoco_A3C_LSTM,Mujoco_PPO,Mujoco_ClippedPPO,Mujoco_DDPG'
             python3 rl_coach/tests/test_eks.py -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn trace-test-mujoco -tc "export TRACE_PRESETS=${TRACE_PRESETS} && make trace_tests_without_docker" -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach-mujoco_environment:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
-          no_output_timeout: 30m
+          no_output_timeout: 45m
       - run:
           name: cleanup
           command: |
diff --git a/docker/Makefile b/docker/Makefile
index 0129c58..716b06d 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -45,7 +45,7 @@ endif
 ifndef FUNCTIONAL_PRESETS
 	FUNCTIONAL_PRESETS=
 endif
-FUNCTIONAL_TESTS=python3 -m pytest rl_coach/tests -s -v -k ${FUNCTIONAL_PRESETS} -m functional_test
+FUNCTIONAL_TESTS=python3 -m pytest rl_coach/tests -s -v ${FUNCTIONAL_PRESETS} -m functional_test
 
 # Golden Tests
 ifdef GOLDEN_PRESETS
diff --git a/rl_coach/presets/Mujoco_A3C_LSTM.py b/rl_coach/presets/Mujoco_A3C_LSTM.py
index 323f28c..781bf5d 100644
--- a/rl_coach/presets/Mujoco_A3C_LSTM.py
+++ b/rl_coach/presets/Mujoco_A3C_LSTM.py
@@ -47,7 +47,7 @@ env_params = GymVectorEnvironment(level=SingleLevelSelection(mujoco_v2))
 # Test #
 ########
 preset_validation_params = PresetValidationParameters()
-preset_validation_params.test = True
+preset_validation_params.test = False
 preset_validation_params.min_reward_threshold = 400
 preset_validation_params.max_episodes_to_achieve_reward = 1000
 preset_validation_params.num_workers = 8