Test updates

Unused imports removed