Refactor long method into class
Change test command and file list output