- After removal of the ClientWrapper class, the mocking of clients needs to be changed to _create_client function. - Commented failing tests due to persistence issues. The persistence is being caused as the new mocked clients not being used as the older clients are persisting over the tests. Change-Id: Ie342c9fc8103504dd12f49ae30b3bf62d189ce1d