Clean up the test client and its output, add more headers to API call