Orders are generated every x seconds, test functions updated.
Merge remote-tracking branch 'origin/master'