Merge "Some cleanup of doApiRequest in test module"