Removal of some old test Classes