deleted depricated tests, fixed other
deleted depricated tests, fixed other