fixed test for multiple updates in same second (to work with scheduler)
Merge remote-tracking branch 'origin/rnd-internal-api' into rnd-internal-api