Deleted innusued Classes & Add Tests