Fix file name issue and failing issue