Merge and Test files added