Nightly checkin
Fixed stand alone unit tests to work with ref server
Updates for unified unit tests
Formatting