Removing unused use statements
Fixing test