Moving client invocations to the test folder