Added overload for public clients, test coverage

Added overload for public clients, test coverage