removed time arg from tick and tock
added in correct fake time setting
Merge branch 'robert-notime' into develop