BigDeletion of unnecessary classes, enhanced Tests