diff --git a/src/gui/widgets/timeline/timeline-state.cpp b/src/gui/widgets/timeline/timeline-state.cpp
index 06e67dfa0..62f67aa08 100644
--- a/src/gui/widgets/timeline/timeline-state.cpp
+++ b/src/gui/widgets/timeline/timeline-state.cpp
@@ -51,7 +51,9 @@ TimelineState::TimelineState (boost::shared_ptr<model::Sequence> source_sequence
   REQUIRE(sequence);
   
   ////////////////////////////////////////////////////////////TICKET #798: how to handle GUI default state
-  viewWindow.set_time_scale(21000000);
+  const int64_t DEFAULT_TIMELINE_SCALE =21000000;
+  
+  viewWindow.set_time_scale(DEFAULT_TIMELINE_SCALE);
 
   setSelection (Mutation::changeTime (Time(FSecs(2))));
   setSelection (Mutation::changeDuration(Duration(FSecs(2))));
diff --git a/tests/components/proc/control/command-argument-test.cpp b/tests/components/proc/control/command-argument-test.cpp
index 094f63d2a..edd36dc1c 100644
--- a/tests/components/proc/control/command-argument-test.cpp
+++ b/tests/components/proc/control/command-argument-test.cpp
@@ -244,7 +244,7 @@ namespace test    {
           arg3->storeTuple (tuple::make (rand() % 10, TimeVar(randTime())));
           arg4->storeTuple (tuple::make (rand() % 10, TimeVar(randTime())));
 
-          arg5->storeTuple (tuple::make (TTime (randTime()), Tstr("glorious"), rand() % 25));
+          arg5->storeTuple (tuple::make (TTime (randTime()), Tstr("glorious"), 10 + rand() % 90));
 
           CHECK (!arg5->canUndo());