Fixing issue with previous timestamp modifications
Making testrun finish immediately when the run completes instead of always waiting for the timeout