Acceptance test updates