Unit Tests; Removed unused use statements