Test cases
Merge changes
New files added