Fix tests broken by acceptance test fixes