Removed save files + created testClass
Merge