Temp commit for collaboration.
Fixed test references for scheduler
Making Todds long running tests execute standalone.
Fixed bug in path generation that causes the zk impl to fail
Fixes temp data structure removal