Test adding new file
Merge tests