test fixed
cli-wrapper is not needed anymore
timing fix
fixed testserver
delay should be greater-equals delay
Merge branch 'binRewrite'
Merge branch 'microtimeRewrite'