working on fixes unit tests.
Removed Node property from Cursor, and now pass it along the call stack.