Added some changes in NodeTest to assure correct echo.
Added fixes in gateway regarding disconnect procedure.
Refactored CurrentSchedulerId.