Use proper database for test env
Remove folder creation through file name