Tests corrected
Deleted unnecessary files