Fix tests to match changes in workbench