Sprint#4 review comment changes for Public.Test classes test code development

...pment