Adds better client testing