Remove unused mock parameter in test clients and fix import order

Change-Id: I3259aad5cb6125613e85c0f4659135d3cd91adc9