Fix tests and add backwards compatibility for workarounds on jobs bug.