Merge "Update unit tests to use new socket schema" into rvc-dev