Acceptance test fixes