Add Test Validation for SO and DO, fix DO create