Fixed test folder detection and removed automatic file creation
Minor updates