Acceptance test improvements

WIP