Clean up some more admin stuff.
Cleaning up Adding a test for clients.