Merge branch 'develop'
Merge branch 'develop'
Add simplified factory methods for creating client and test client
Set private properties and methods where appropriate
CS fixes