diff --git a/Cognite.Simulator.Tests/UtilsTests/SimulationSchedulerTest.cs b/Cognite.Simulator.Tests/UtilsTests/SimulationSchedulerTest.cs
index 0b966609..2f2d3384 100644
--- a/Cognite.Simulator.Tests/UtilsTests/SimulationSchedulerTest.cs
+++ b/Cognite.Simulator.Tests/UtilsTests/SimulationSchedulerTest.cs
@@ -11,6 +11,7 @@
 using System.Threading.Tasks;
 using Xunit;
 using CogniteSdk.Alpha;
+using NCrontab;
 
 namespace Cognite.Simulator.Tests.UtilsTests
 {
@@ -37,9 +38,27 @@ public Task Delay(TimeSpan delay, CancellationToken token)
         }
     }
 
+
     [Collection(nameof(SequentialTestCollection))]
     public class SimulationSchedulerTest
     {
+        [Fact(DisplayName = "Test Basic Working of Scheduler")]
+        public void TestBasicWorkingofExternalLibrary()
+        {
+            var job = new ScheduledJob<SimulatorRoutineRevision>() { };
+            job.SetSchedule("*/5 * * * *");
+            var nextOccurence = job.Schedule.GetNextOccurrence(DateTime.Now);
+            Assert.True(nextOccurence > DateTime.Now);
+
+
+            Assert.Throws<CrontabException>(() =>
+            {
+                job = new ScheduledJob<SimulatorRoutineRevision>() { };
+                job.SetSchedule("0 0 0 0 0");
+            });
+
+        }
+
         [Fact]
         public async Task TestSimulationSchedulerBase()
         {
diff --git a/Cognite.Simulator.Utils/SimulationScheduler.cs b/Cognite.Simulator.Utils/SimulationScheduler.cs
index d24b1053..4149945d 100644
--- a/Cognite.Simulator.Utils/SimulationScheduler.cs
+++ b/Cognite.Simulator.Utils/SimulationScheduler.cs
@@ -73,6 +73,19 @@ public class ScheduledJob<V> where V : SimulatorRoutineRevision
         /// Routine revision.
         /// </summary>
         public V RoutineRevision { get; set; }
+
+        /// <summary>
+        /// Set schedule
+        /// </summary>
+        /// <param name="schedule">Crontab schedule</param>
+        /// <returns>Self</returns>
+        /// <exception cref="CrontabException">If the schedule is invalid</exception>
+        /// 
+        public ScheduledJob<V> SetSchedule(string CronExpression)
+        {
+            Schedule = CrontabSchedule.Parse(CronExpression);
+            return this;
+        }
     }
     /// <summary>
     /// This class implements a basic simulation scheduler. It runs a loop on a configurable interval.
@@ -171,14 +184,13 @@ await Task.Run(async () =>
                                 {
                                     continue;
                                 }
-                                var schedule = CrontabSchedule.Parse(routineRev.Configuration.Schedule.CronExpression);
                                 var newJob = new ScheduledJob<V>
                                 {
-                                    Schedule = schedule,
                                     TokenSource = new CancellationTokenSource(),
                                     CreatedTime = routineRev.CreatedTime,
                                     RoutineRevision = routineRev,
                                 };
+                                newJob.SetSchedule(routineRev.Configuration.Schedule.CronExpression);
                                 _logger.LogDebug("Created new job for schedule: {0} with id {1}", routineRev.Configuration.Schedule.CronExpression, routineRev.ExternalId);
                                 scheduledJobs.Add(routineRev.RoutineExternalId, newJob);
                             }