Removed an unused import.  Changed an internal test module name so that it would be unique.
Removed an unused import.  Changed an internal test module name so that it would be unique.

CleanCut/green,CleanCut/green,krisztianfekete/green,smspillaz/green,wfxiang08/green,smspillaz/green,wfxiang08/green,krisztianfekete/green,smspillaz/green,wfxiang08/green