[NF] Update VS test client due to changes in core classes.
[NF] Updated VS test client.