More work done on test tool.
Updated executor and naming service to be functional with USN v2.