Fix unused imports
Add emtpy file and subdirectories tests