Updated the unit tests to construct the V3 format