Removed unused use
Fixed tests