updated file regex
updated tests