Fixed to handle files other than tests