Remove unnecessarily added-back tests