Removed unused use statment, improved tests