Moving scenario specs to integration specs