removing the global
shifting how the mock client is created
building out the mock client creation and validation