Removing tests
Merge files