Add validation for stream/job definition
Fix test