Adding scenarios for OA-2578