--Enriching Job and Cluster with required fields
--Improving Test Coverage