Added short options
Improved regexp not to accept subdirs
Fixing the test after updating consegna