Acceptance Test tweak