WIP on refactoring acceptance test utils