changes in files handling + 1 test