DEV-3852 changes to USDTest