Startup changes.
Adding TestNode and other changes.