Added unit tests.  Finished clean filename.