Cleaned up how we retrieve client objects
Shifted to testing reference capture action