Clients model and test model streamlined

Updated client model and test to be streamlined based on @vanstee's suggestion. Ran test suite against changes. Will do separate pull for Projects.