Added tests
Merge files