Allowing test service client to be retrieved from helper
Moving to centralized ServiceClient refs
Ensure that errors are checked
Adding missing test for associate
Fixing small issues based on code review