Merge "Update test to specify WorkTypes directly." into sc-dev