Add concurrent control into concurrent test case
organize imports