Eliminates deprecated tests