Strengthen tests