Adding additional validation tests