Import cleanup, coding style

Removed unused imports from tests.
Few codng style related changes.