Made changes to include the new client test project