Some more :test eradication