Added validation testing