Refactor infrastructure for console acceptance tests