Fixed more issues with benchmark
Fixes for execution
Cleanup for test
Fixes to code
Merged in cursorReworkingToAvoidNextTick branch