Overhaul command handling in acceptance tests