New files added with testing