added new scenarios for SAM upgrade, fixed failing tests