Issue #4: Added client_id specific functions (more work still required)
Test