DSVC-112,
Test fixes