tests time measurement
small fix in tests for transient problems
Merge remote-tracking branch 'mach/master'