Gradually restored more tests