Added defunct tests