Work on system test

Change-Id: Ied1ac24893338b485bd28213da92a084d2ed66f7
Remove unused imports

Change-Id: I11519883a8514ca3a195db94ad17b4f344ea0450