Replace tests accidentally removed by previous commits