Add tests for the starred client
Adjust namespacing and docs