Remove unused mock parameter in test clients and fix import order
Remove unused mock parameter in test clients and fix import order

Change-Id: I3259aad5cb6125613e85c0f4659135d3cd91adc9

devdattakulkarni/test-solum,ed-/solum,devdattakulkarni/test-solum,gilbertpilz/solum,stackforge/solum,stackforge/solum,openstack/solum,ed-/solum,ed-/solum,gilbertpilz/solum,openstack/solum,gilbertpilz/solum,ed-/solum,gilbertpilz/solum